Move a bunch of chrome/browser/ files into a policy/ subdir.

BUG=50548
TEST=compiles

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55503 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 81 insertions, 81 deletions

diff --git a/chrome/browser/net/chrome_url_request_context_unittest.cc b/chrome/browser/net/chrome_url_request_context_unittest.cc
index af67e57..0dd84f0 100644
--- a/chrome/browser/net/chrome_url_request_context_unittest.cc
+++ b/chrome/browser/net/chrome_url_request_context_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
-#include "chrome/browser/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/pref_value_store.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/testing_pref_service.h"
diff --git a/chrome/browser/config_dir_policy_provider.cc b/chrome/browser/policy/config_dir_policy_provider.cc
index f0ec6eb..92e9714 100644
--- a/chrome/browser/config_dir_policy_provider.cc
+++ b/chrome/browser/policy/config_dir_policy_provider.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/config_dir_policy_provider.h"
+#include "chrome/browser/policy/config_dir_policy_provider.h"
 
 #include <set>
 
diff --git a/chrome/browser/config_dir_policy_provider.h b/chrome/browser/policy/config_dir_policy_provider.h
index 9279438..9412ff2 100644
--- a/chrome/browser/config_dir_policy_provider.h
+++ b/chrome/browser/policy/config_dir_policy_provider.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CONFIG_DIR_POLICY_PROVIDER_H_
-#define CHROME_BROWSER_CONFIG_DIR_POLICY_PROVIDER_H_
+#ifndef CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_PROVIDER_H_
+#define CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_PROVIDER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "chrome/browser/configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
 
 class DictionaryValue;
 
@@ -40,4 +40,4 @@ class ConfigDirPolicyProvider : public ConfigurationPolicyProvider {
   DISALLOW_COPY_AND_ASSIGN(ConfigDirPolicyProvider);
 };
 
-#endif  // CHROME_BROWSER_CONFIG_DIR_POLICY_PROVIDER_H_
+#endif  // CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_PROVIDER_H_
diff --git a/chrome/browser/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
index 14dad65..987a50b 100644
--- a/chrome/browser/config_dir_policy_provider_unittest.cc
+++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
@@ -5,8 +5,8 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
-#include "chrome/browser/config_dir_policy_provider.h"
-#include "chrome/browser/mock_configuration_policy_store.h"
+#include "chrome/browser/policy/config_dir_policy_provider.h"
+#include "chrome/browser/policy/mock_configuration_policy_store.h"
 #include "chrome/common/json_value_serializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index 979cb64..b6fd1e6 100644
--- a/chrome/browser/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -11,15 +11,15 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
 #if defined(OS_WIN)
-#include "chrome/browser/configuration_policy_provider_win.h"
+#include "chrome/browser/policy/configuration_policy_provider_win.h"
 #elif defined(OS_MACOSX)
-#include "chrome/browser/configuration_policy_provider_mac.h"
+#include "chrome/browser/policy/configuration_policy_provider_mac.h"
 #elif defined(OS_POSIX)
-#include "chrome/browser/config_dir_policy_provider.h"
+#include "chrome/browser/policy/config_dir_policy_provider.h"
 #endif
-#include "chrome/browser/dummy_configuration_policy_provider.h"
+#include "chrome/browser/policy/dummy_configuration_policy_provider.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/configuration_policy_pref_store.h b/chrome/browser/policy/configuration_policy_pref_store.h
index fd28652..df35238 100644
--- a/chrome/browser/configuration_policy_pref_store.h
+++ b/chrome/browser/policy/configuration_policy_pref_store.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CONFIGURATION_POLICY_PREF_STORE_H_
-#define CHROME_BROWSER_CONFIGURATION_POLICY_PREF_STORE_H_
+#ifndef CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PREF_STORE_H_
+#define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PREF_STORE_H_
 #pragma once
 
 #include <string>
@@ -12,8 +12,8 @@
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "base/values.h"
-#include "chrome/browser/configuration_policy_provider.h"
-#include "chrome/browser/configuration_policy_store.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_store.h"
 #include "chrome/common/pref_store.h"
 
 class CommandLine;
@@ -104,4 +104,4 @@ class ConfigurationPolicyPrefStore : public PrefStore,
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyPrefStore);
 };
 
-#endif  // CHROME_BROWSER_CONFIGURATION_POLICY_PREF_STORE_H_
+#endif  // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PREF_STORE_H_
diff --git a/chrome/browser/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index 44eb782..fa63845 100644
--- a/chrome/browser/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/file_path.h"
-#include "chrome/browser/configuration_policy_pref_store.h"
-#include "chrome/browser/mock_configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/chrome_switches.h"
 
diff --git a/chrome/browser/configuration_policy_provider.cc b/chrome/browser/policy/configuration_policy_provider.cc
index 3f1f436..99c61cf 100644
--- a/chrome/browser/configuration_policy_provider.cc
+++ b/chrome/browser/policy/configuration_policy_provider.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
 
 #include "base/values.h"
 #include "chrome/common/policy_constants.h"
diff --git a/chrome/browser/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h
index 3bbbf22..a0802e8 100644
--- a/chrome/browser/configuration_policy_provider.h
+++ b/chrome/browser/policy/configuration_policy_provider.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_H_
-#define CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_H_
+#ifndef CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_H_
+#define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/values.h"
-#include "chrome/browser/configuration_policy_store.h"
+#include "chrome/browser/policy/configuration_policy_store.h"
 
 // A mostly-abstract super class for platform-specific policy providers.
 // Platform-specific policy providers (Windows Group Policy, gconf,
@@ -51,4 +51,4 @@ class ConfigurationPolicyProvider {
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyProvider);
 };
 
-#endif  // CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_H_
+#endif  // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_H_
diff --git a/chrome/browser/configuration_policy_provider_mac.cc b/chrome/browser/policy/configuration_policy_provider_mac.cc
index c1a9c2c..77e3a4c 100644
--- a/chrome/browser/configuration_policy_provider_mac.cc
+++ b/chrome/browser/policy/configuration_policy_provider_mac.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/configuration_policy_provider_mac.h"
+#include "chrome/browser/policy/configuration_policy_provider_mac.h"
 
 #include "base/logging.h"
 #include "base/scoped_cftyperef.h"
diff --git a/chrome/browser/configuration_policy_provider_mac.h b/chrome/browser/policy/configuration_policy_provider_mac.h
index 24d19a2..ab24473 100644
--- a/chrome/browser/configuration_policy_provider_mac.h
+++ b/chrome/browser/policy/configuration_policy_provider_mac.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_MAC_H_
-#define CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_MAC_H_
+#ifndef CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_MAC_H_
+#define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_MAC_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/configuration_policy_store.h"
-#include "chrome/browser/configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_store.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/preferences_mac.h"
 
 // An implementation of |ConfigurationPolicyProvider| using the mechanism
@@ -27,5 +27,5 @@ class ConfigurationPolicyProviderMac : public ConfigurationPolicyProvider {
   scoped_ptr<MacPreferences> preferences_;
 };
 
-#endif  // CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_MAC_H_
+#endif  // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_MAC_H_
 
diff --git a/chrome/browser/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
index 4e6885d..23f01b7 100644
--- a/chrome/browser/configuration_policy_provider_mac_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "base/stl_util-inl.h"
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/configuration_policy_provider_mac.h"
-#include "chrome/browser/mock_configuration_policy_store.h"
+#include "chrome/browser/policy/configuration_policy_provider_mac.h"
+#include "chrome/browser/policy/mock_configuration_policy_store.h"
 #include "chrome/browser/preferences_mock_mac.h"
 
 // A subclass of |ConfigurationPolicyProviderMac| providing access to various
diff --git a/chrome/browser/configuration_policy_provider_win.cc b/chrome/browser/policy/configuration_policy_provider_win.cc
index 9549367..4085b14 100644
--- a/chrome/browser/configuration_policy_provider_win.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/configuration_policy_provider_win.h"
+#include "chrome/browser/policy/configuration_policy_provider_win.h"
 
 #include <userenv.h>
 
diff --git a/chrome/browser/configuration_policy_provider_win.h b/chrome/browser/policy/configuration_policy_provider_win.h
index 522b538..e2ebbdb 100644
--- a/chrome/browser/configuration_policy_provider_win.h
+++ b/chrome/browser/policy/configuration_policy_provider_win.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_WIN_H_
-#define CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_WIN_H_
+#ifndef CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_WIN_H_
+#define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_WIN_H_
 #pragma once
 
 #include "base/object_watcher.h"
 #include "base/scoped_ptr.h"
 #include "base/waitable_event.h"
-#include "chrome/browser/configuration_policy_store.h"
-#include "chrome/browser/configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_store.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
 
 // An implementation of |ConfigurationPolicyProvider| using the
 // mechanism provided by Windows Groups Policy. Policy decisions are
@@ -58,5 +58,5 @@ class ConfigurationPolicyProviderWin : public ConfigurationPolicyProvider {
   bool GetRegistryPolicyInteger(const wchar_t* value_name, uint32* result);
 };
 
-#endif  // CHROME_BROWSER_CONFIGURATION_POLICY_PROVIDER_WIN_H_
+#endif  // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_WIN_H_
 
diff --git a/chrome/browser/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
index ed66b4f..221ef83 100644
--- a/chrome/browser/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -12,8 +12,8 @@
 #include "base/stl_util-inl.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/configuration_policy_provider_win.h"
-#include "chrome/browser/mock_configuration_policy_store.h"
+#include "chrome/browser/policy/configuration_policy_provider_win.h"
+#include "chrome/browser/policy/mock_configuration_policy_store.h"
 #include "chrome/common/policy_constants.h"
 #include "chrome/common/pref_names.h"
 
diff --git a/chrome/browser/configuration_policy_store.h b/chrome/browser/policy/configuration_policy_store.h
index 50c6f17..80d9a56 100644
--- a/chrome/browser/configuration_policy_store.h
+++ b/chrome/browser/policy/configuration_policy_store.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CONFIGURATION_POLICY_STORE_H_
-#define CHROME_BROWSER_CONFIGURATION_POLICY_STORE_H_
+#ifndef CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_STORE_H_
+#define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_STORE_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -54,4 +54,4 @@ class ConfigurationPolicyStore {
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyStore);
 };
 
-#endif  // CHROME_BROWSER_CONFIGURATION_POLICY_STORE_H_
+#endif  // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_STORE_H_
diff --git a/chrome/browser/dummy_configuration_policy_provider.h b/chrome/browser/policy/dummy_configuration_policy_provider.h
index a3e3508..9309c00 100644
--- a/chrome/browser/dummy_configuration_policy_provider.h
+++ b/chrome/browser/policy/dummy_configuration_policy_provider.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DUMMY_CONFIGURATION_POLICY_PROVIDER_H_
-#define CHROME_BROWSER_DUMMY_CONFIGURATION_POLICY_PROVIDER_H_
+#ifndef CHROME_BROWSER_POLICY_DUMMY_CONFIGURATION_POLICY_PROVIDER_H_
+#define CHROME_BROWSER_POLICY_DUMMY_CONFIGURATION_POLICY_PROVIDER_H_
 #pragma once
 
-#include "chrome/browser/configuration_policy_store.h"
-#include "chrome/browser/configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_store.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
 
 class DummyConfigurationPolicyProvider : public ConfigurationPolicyProvider {
  public:
@@ -22,5 +22,5 @@ class DummyConfigurationPolicyProvider : public ConfigurationPolicyProvider {
   DISALLOW_COPY_AND_ASSIGN(DummyConfigurationPolicyProvider);
 };
 
-#endif  // CHROME_BROWSER_DUMMY_CONFIGURATION_POLICY_PROVIDER_H_
+#endif  // CHROME_BROWSER_POLICY_DUMMY_CONFIGURATION_POLICY_PROVIDER_H_
 
diff --git a/chrome/browser/mock_configuration_policy_provider.h b/chrome/browser/policy/mock_configuration_policy_provider.h
index 8b08f33..2d727467 100644
--- a/chrome/browser/mock_configuration_policy_provider.h
+++ b/chrome/browser/policy/mock_configuration_policy_provider.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
-#define CHROME_BROWSER_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
+#ifndef CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
+#define CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 #pragma once
 
 #include <map>
 
 #include "base/stl_util-inl.h"
-#include "chrome/browser/configuration_policy_provider.h"
+#include "chrome/browser/policy/configuration_policy_provider.h"
 
 // Mock ConfigurationPolicyProvider implementation that supplies canned
 // values for polices.
@@ -39,5 +39,5 @@ class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
   PolicyMap policy_map_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
+#endif  // CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 
diff --git a/chrome/browser/mock_configuration_policy_store.h b/chrome/browser/policy/mock_configuration_policy_store.h
index 71917da..c1ab12d 100644
--- a/chrome/browser/mock_configuration_policy_store.h
+++ b/chrome/browser/policy/mock_configuration_policy_store.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_CONFIGURATION_POLICY_STORE_H_
-#define CHROME_BROWSER_MOCK_CONFIGURATION_POLICY_STORE_H_
+#ifndef CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_STORE_H_
+#define CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_STORE_H_
 #pragma once
 
 #include <map>
 
 #include "base/stl_util-inl.h"
-#include "chrome/browser/configuration_policy_store.h"
+#include "chrome/browser/policy/configuration_policy_store.h"
 
 // Mock ConfigurationPolicyStore implementation that records values for policy
 // settings as they get set.
@@ -32,4 +32,4 @@ class MockConfigurationPolicyStore : public ConfigurationPolicyStore {
   PolicyMap policy_map_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_CONFIGURATION_POLICY_STORE_H_
+#endif  // CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_STORE_H_
diff --git a/chrome/browser/pref_service.cc b/chrome/browser/pref_service.cc
index 826b424..1fa5e6b 100644
--- a/chrome/browser/pref_service.cc
+++ b/chrome/browser/pref_service.cc
@@ -20,7 +20,7 @@
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/notification_service.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/pref_value_store.cc b/chrome/browser/pref_value_store.cc
index ab72336c..70837f0 100644
--- a/chrome/browser/pref_value_store.cc
+++ b/chrome/browser/pref_value_store.cc
@@ -7,7 +7,7 @@
 #include "base/values.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/command_line_pref_store.h"
-#include "chrome/browser/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/pref_value_store_unittest.cc b/chrome/browser/pref_value_store_unittest.cc
index 55982d9..a4af696 100644
--- a/chrome/browser/pref_value_store_unittest.cc
+++ b/chrome/browser/pref_value_store_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dummy_pref_store.h"
 #include "chrome/browser/pref_value_store.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e525df9..3e5fe39 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1062,17 +1062,6 @@
         'browser/command_line_pref_store.h',
         'browser/command_updater.cc',
         'browser/command_updater.h',
-        'browser/config_dir_policy_provider.cc',
-        'browser/config_dir_policy_provider.h',
-        'browser/configuration_policy_store.h',
-        'browser/configuration_policy_pref_store.cc',
-        'browser/configuration_policy_pref_store.h',
-        'browser/configuration_policy_provider.cc',
-        'browser/configuration_policy_provider.h',
-        'browser/configuration_policy_provider_mac.cc',
-        'browser/configuration_policy_provider_mac.h',
-        'browser/configuration_policy_provider_win.cc',
-        'browser/configuration_policy_provider_win.h',
         'browser/content_exceptions_table_model.cc',
         'browser/content_exceptions_table_model.h',
         'browser/content_setting_bubble_model.cc',
@@ -1248,7 +1237,6 @@
         'browser/download/save_package.cc',
         'browser/download/save_package.h',
         'browser/download/save_types.h',
-        'browser/dummy_configuration_policy_provider.h',
         'browser/encoding_menu_controller.cc',
         'browser/encoding_menu_controller.h',
         'browser/extensions/convert_user_script.cc',
@@ -2093,6 +2081,20 @@
         'browser/plugin_service.h',
         'browser/plugin_updater.cc',
         'browser/plugin_updater.h',
+        'browser/policy/config_dir_policy_provider.cc',
+        'browser/policy/config_dir_policy_provider.h',
+        'browser/policy/configuration_policy_pref_store.cc',
+        'browser/policy/configuration_policy_pref_store.h',
+        'browser/policy/configuration_policy_provider.cc',
+        'browser/policy/configuration_policy_provider.cc',
+        'browser/policy/configuration_policy_provider.h',
+        'browser/policy/configuration_policy_provider.h',
+        'browser/policy/configuration_policy_provider_mac.cc',
+        'browser/policy/configuration_policy_provider_mac.h',
+        'browser/policy/configuration_policy_provider_win.cc',
+        'browser/policy/configuration_policy_provider_win.h',
+        'browser/policy/configuration_policy_store.h',
+        'browser/policy/dummy_configuration_policy_provider.h',
         'browser/popup_blocked_animation.h',
         'browser/possible_url_model.cc',
         'browser/possible_url_model.h',
@@ -2316,8 +2318,6 @@
         'browser/sessions/session_types.h',
         'browser/sessions/tab_restore_service.cc',
         'browser/sessions/tab_restore_service.h',
-        'browser/configuration_policy_provider.cc',
-        'browser/configuration_policy_provider.h',
         'browser/shell_dialogs.h',
         'browser/shell_integration.cc',
         'browser/shell_integration.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 822aaba..9975270 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -910,12 +910,8 @@
         'browser/cocoa/window_size_autosaver_unittest.mm',
         'browser/cocoa/wrench_menu_button_cell_unittest.mm',
         'browser/cocoa/wrench_menu_controller_unittest.mm',
-        'browser/config_dir_policy_provider_unittest.cc',
         'browser/command_line_pref_store_unittest.cc',
         'browser/command_updater_unittest.cc',
-        'browser/configuration_policy_pref_store_unittest.cc',
-        'browser/configuration_policy_provider_mac_unittest.cc',
-        'browser/configuration_policy_provider_win_unittest.cc',
         'browser/cookies_tree_model_unittest.cc',
         'browser/debugger/devtools_manager_unittest.cc',
         'browser/dock_info_unittest.cc',
@@ -1013,8 +1009,6 @@
         'browser/metrics/metrics_log_unittest.cc',
         'browser/metrics/metrics_response_unittest.cc',
         'browser/metrics/metrics_service_unittest.cc',
-        'browser/mock_configuration_policy_provider.h',
-        'browser/mock_configuration_policy_store.h',
         'browser/net/chrome_url_request_context_unittest.cc',
         'browser/net/connection_tester_unittest.cc',
         'browser/net/gaia/token_service_unittest.cc',
@@ -1040,6 +1034,12 @@
         'browser/password_manager/password_store_default_unittest.cc',
         'browser/password_manager/password_store_mac_unittest.cc',
         'browser/password_manager/password_store_win_unittest.cc',
+        'browser/policy/config_dir_policy_provider_unittest.cc',
+        'browser/policy/configuration_policy_pref_store_unittest.cc',
+        'browser/policy/configuration_policy_provider_mac_unittest.cc',
+        'browser/policy/configuration_policy_provider_win_unittest.cc',
+        'browser/policy/mock_configuration_policy_provider.h',
+        'browser/policy/mock_configuration_policy_store.h',
         'browser/pref_member_unittest.cc',
         'browser/pref_service_unittest.cc',
         'browser/pref_set_observer_unittest.cc',