Reland 72784

This is the first step to being able to re-constitute policy from a non-generic protobuf in a policy request in a fully automated way (i.e. the code for the process can be generated). The non-generic protobuf is required for automatic merging of policy on the server-side.

BUG=68309
TEST=existing policy/provider tests

Review URL: http://codereview.chromium.org/6357021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72956 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome_frame/policy_settings.cc b/chrome_frame/policy_settings.cc
index 116052b3..a6741a3 100644
--- a/chrome_frame/policy_settings.cc
+++ b/chrome_frame/policy_settings.cc
@@ -10,8 +10,8 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
-#include "chrome/common/policy_constants.h"
 #include "chrome_frame/utils.h"
+#include "policy/policy_constants.h"
 
 namespace {