10 files changed, 34 insertions, 16 deletions
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 86bb63f..78108cb 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -39,7 +39,7 @@
 #include "chrome/browser/policy/javascript_policy_handler.h"
 #include "chrome/browser/policy/network_prediction_policy_handler.h"
 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
-#include "chrome/browser/sync/sync_policy_handler.h"
+#include "components/sync_driver/sync_policy_handler.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -610,7 +610,7 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
   handlers->AddHandler(make_scoped_ptr(new JavascriptPolicyHandler()));
   handlers->AddHandler(make_scoped_ptr(new NetworkPredictionPolicyHandler()));
   handlers->AddHandler(make_scoped_ptr(new RestoreOnStartupPolicyHandler()));
-  handlers->AddHandler(make_scoped_ptr(new browser_sync::SyncPolicyHandler()));
+  handlers->AddHandler(make_scoped_ptr(new sync_driver::SyncPolicyHandler()));
 
   handlers->AddHandler(make_scoped_ptr(new StringMappingListPolicyHandler(
       key::kEnableDeprecatedWebPlatformFeatures,
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index af91da2..7d0bcd2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2204,8 +2204,6 @@
       'browser/policy/network_prediction_policy_handler.h',
       'browser/sessions/restore_on_startup_policy_handler.cc',
       'browser/sessions/restore_on_startup_policy_handler.h',
-      'browser/sync/sync_policy_handler.cc',
-      'browser/sync/sync_policy_handler.h',
     ],
     # Policy sources used only on Android and iOS (CrOS not counted).
     'chrome_browser_policy_mobile_sources': [
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 22b1fba8..a766e93 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -972,7 +972,6 @@
       'browser/prefs/proxy_policy_unittest.cc',
       'browser/profiles/incognito_mode_policy_handler_unittest.cc',
       'browser/sessions/restore_on_startup_policy_handler_unittest.cc',
-      'browser/sync/sync_policy_handler_unittest.cc',
     ],
     # This is extensions && policy sources.
     'chrome_unit_tests_extensions_policy_sources': [
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 786c424..a0bf076 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -593,6 +593,7 @@
       'sync_driver/non_blocking_data_type_controller_unittest.cc',
       'sync_driver/non_ui_data_type_controller_unittest.cc',
       'sync_driver/shared_change_processor_unittest.cc',
+      'sync_driver/sync_policy_handler_unittest.cc',
       'sync_driver/sync_prefs_unittest.cc',
       'sync_driver/system_encryptor_unittest.cc',
       'sync_driver/ui_data_type_controller_unittest.cc',
diff --git a/components/sync_driver.gypi b/components/sync_driver.gypi
index b4303e9..fc955c1 100644
--- a/components/sync_driver.gypi
+++ b/components/sync_driver.gypi
@@ -96,6 +96,15 @@
             'sessions_ios',
           ],
         }],
+        ['configuration_policy==1', {
+          'dependencies': [
+            'policy',
+          ],
+          'sources': [
+            'sync_driver/sync_policy_handler.cc',
+            'sync_driver/sync_policy_handler.h',
+          ],
+        }],
       ],
     },
     {
diff --git a/components/sync_driver/BUILD.gn b/components/sync_driver/BUILD.gn
index 8f4e585..7f31a70 100644
--- a/components/sync_driver/BUILD.gn
+++ b/components/sync_driver/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/features.gni")
+
 static_library("sync_driver") {
   sources = [
     "backend_data_type_configurer.cc",
@@ -78,6 +80,13 @@ static_library("sync_driver") {
     "//components/signin/core/browser",
     "//sync",
   ]
+
+  if (enable_configuration_policy) {
+    sources += [
+      "sync_policy_handler.cc",
+      "sync_policy_handler.h",
+    ]
+  }
 }
 
 static_library("test_support") {
diff --git a/components/sync_driver/DEPS b/components/sync_driver/DEPS
index 8961e6d..8f0c860 100644
--- a/components/sync_driver/DEPS
+++ b/components/sync_driver/DEPS
@@ -1,8 +1,10 @@
 include_rules = [
   "+components/os_crypt",
+  "+components/policy",
   "+components/pref_registry",
   "+components/sessions",
   "+components/signin/core/browser",
   "+google_apis",
+  "+policy",
   "+sync",
 ]
diff --git a/chrome/browser/sync/sync_policy_handler.cc b/components/sync_driver/sync_policy_handler.cc
index a1bf46c..e0ed944 100644
--- a/chrome/browser/sync/sync_policy_handler.cc
+++ b/components/sync_driver/sync_policy_handler.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/sync/sync_policy_handler.h"
+#include "components/sync_driver/sync_policy_handler.h"
 
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
@@ -10,7 +10,7 @@
 #include "components/sync_driver/pref_names.h"
 #include "policy/policy_constants.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 SyncPolicyHandler::SyncPolicyHandler()
     : policy::TypeCheckingPolicyHandler(policy::key::kSyncDisabled,
@@ -27,4 +27,4 @@ void SyncPolicyHandler::ApplyPolicySettings(const policy::PolicyMap& policies,
     prefs->SetValue(sync_driver::prefs::kSyncManaged, value->CreateDeepCopy());
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver
diff --git a/chrome/browser/sync/sync_policy_handler.h b/components/sync_driver/sync_policy_handler.h
index 0642614..4b0be81 100644
--- a/chrome/browser/sync/sync_policy_handler.h
+++ b/components/sync_driver/sync_policy_handler.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_SYNC_SYNC_POLICY_HANDLER_H_
-#define CHROME_BROWSER_SYNC_SYNC_POLICY_HANDLER_H_
+#ifndef COMPONENTS_SYNC_DRIVER_SYNC_POLICY_HANDLER_H_
+#define COMPONENTS_SYNC_DRIVER_SYNC_POLICY_HANDLER_H_
 
 #include "base/compiler_specific.h"
 #include "components/policy/core/browser/configuration_policy_handler.h"
 
 class PrefValueMap;
 
-namespace browser_sync {
+namespace sync_driver {
 
 class PolicyMap;
 
@@ -28,6 +28,6 @@ class SyncPolicyHandler : public policy::TypeCheckingPolicyHandler {
   DISALLOW_COPY_AND_ASSIGN(SyncPolicyHandler);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
-#endif  // CHROME_BROWSER_SYNC_SYNC_POLICY_HANDLER_H_
+#endif  // COMPONENTS_SYNC_DRIVER_SYNC_POLICY_HANDLER_H_
diff --git a/chrome/browser/sync/sync_policy_handler_unittest.cc b/components/sync_driver/sync_policy_handler_unittest.cc
index fcaad7c..e0f2c0d 100644
--- a/chrome/browser/sync/sync_policy_handler_unittest.cc
+++ b/components/sync_driver/sync_policy_handler_unittest.cc
@@ -4,13 +4,13 @@
 
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
-#include "chrome/browser/sync/sync_policy_handler.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/sync_driver/pref_names.h"
+#include "components/sync_driver/sync_policy_handler.h"
 #include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 // Test cases for the Sync policy setting.
 class SyncPolicyHandlerTest : public testing::Test {};
@@ -59,4 +59,4 @@ TEST_F(SyncPolicyHandlerTest, Disabled) {
   EXPECT_TRUE(sync_managed);
 }
 
-}  // namespace browser_sync
+}  // namespace sync_driver