SetManagementSettings() is moved to OwnerSettingsServiceChromeOS.

chrome/browser/chromeos/settings/device_settings_service_unittest.cc

Index: chrome/browser/chromeos/settings/device_settings_service_unittest.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
index e0b4b79bfa87eb57eac22f1cf4fcec10763bd8c1..dfc9b92a506d4f63fabdd05b7761cfb7d1244499 100644
--- a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
@@ -10,6 +10,8 @@
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
@@ -142,153 +144,6 @@ TEST_F(DeviceSettingsServiceTest, LoadSuccess) {
   CheckPolicy();
 }
 
-TEST_F(DeviceSettingsServiceTest, SetManagementSettingsModeTransition) {
-  ReloadDeviceSettings();
-  EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
-            device_settings_service_.status());
-
-  owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  InitOwner(device_policy_.policy_data().username(), true);
-  FlushDeviceSettings();
-
-  // The initial management mode should be LOCAL_OWNER.
-  EXPECT_EQ(em::PolicyData::LOCAL_OWNER,
-            device_settings_service_.policy_data()->management_mode());
-
-  // LOCAL_OWNER -> CONSUMER_MANAGED: Okay.
-  device_settings_service_.SetManagementSettings(
-      em::PolicyData::CONSUMER_MANAGED,
-      "fake_request_token",
-      "fake_device_id",
-      base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
-                 base::Unretained(this)));
-  FlushDeviceSettings();
-
-  EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
-            device_settings_service_.status());
-  EXPECT_EQ(em::PolicyData::CONSUMER_MANAGED,
-            device_settings_service_.policy_data()->management_mode());
-
-  // CONSUMER_MANAGED -> ENTERPRISE_MANAGED: Invalid.
-  device_settings_service_.SetManagementSettings(
-      em::PolicyData::ENTERPRISE_MANAGED,
-      "fake_request_token",
-      "fake_device_id",
-      base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
-                 base::Unretained(this)));
-  FlushDeviceSettings();
-
-  EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_POLICY_ERROR,
-            device_settings_service_.status());
-  EXPECT_EQ(em::PolicyData::CONSUMER_MANAGED,
-            device_settings_service_.policy_data()->management_mode());
-
-  // CONSUMER_MANAGED -> LOCAL_OWNER: Okay.
-  device_settings_service_.SetManagementSettings(
-      em::PolicyData::LOCAL_OWNER,
-      "fake_request_token",
-      "fake_device_id",
-      base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
-                 base::Unretained(this)));
-  FlushDeviceSettings();
-
-  EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
-            device_settings_service_.status());
-  EXPECT_EQ(em::PolicyData::LOCAL_OWNER,
-            device_settings_service_.policy_data()->management_mode());
-
-  // LOCAL_OWNER -> ENTERPRISE_MANAGED: Invalid.
-  device_settings_service_.SetManagementSettings(
-      em::PolicyData::ENTERPRISE_MANAGED,
-      "fake_request_token",
-      "fake_device_id",
-      base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
-                 base::Unretained(this)));
-  FlushDeviceSettings();
-
-  EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_POLICY_ERROR,
-            device_settings_service_.status());
-  EXPECT_EQ(em::PolicyData::LOCAL_OWNER,
-            device_settings_service_.policy_data()->management_mode());
-
-  // Inject a policy data with management mode set to ENTERPRISE_MANAGED.
-  device_policy_.policy_data().set_management_mode(
-      em::PolicyData::ENTERPRISE_MANAGED);
-  device_policy_.Build();
-  device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
-  ReloadDeviceSettings();
-  EXPECT_EQ(em::PolicyData::ENTERPRISE_MANAGED,
-            device_settings_service_.policy_data()->management_mode());
-
-  // ENTERPRISE_MANAGED -> LOCAL_OWNER: Invalid.
-  device_settings_service_.SetManagementSettings(
-      em::PolicyData::LOCAL_OWNER,
-      "fake_request_token",
-      "fake_device_id",
-      base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
-                 base::Unretained(this)));
-  FlushDeviceSettings();
-
-  EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_POLICY_ERROR,
-            device_settings_service_.status());
-  EXPECT_EQ(em::PolicyData::ENTERPRISE_MANAGED,
-            device_settings_service_.policy_data()->management_mode());
-
-  // ENTERPRISE_MANAGED -> CONSUMER_MANAGED: Invalid.
-  device_settings_service_.SetManagementSettings(
-      em::PolicyData::CONSUMER_MANAGED,
-      "fake_request_token",
-      "fake_device_id",
-      base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
-                 base::Unretained(this)));
-  FlushDeviceSettings();
-
-  EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_POLICY_ERROR,
-            device_settings_service_.status());
-  EXPECT_EQ(em::PolicyData::ENTERPRISE_MANAGED,
-            device_settings_service_.policy_data()->management_mode());
-
-}
-
-TEST_F(DeviceSettingsServiceTest, SetManagementSettingsSuccess) {
-  ReloadDeviceSettings();
-  EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
-            device_settings_service_.status());
-
-  owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
-  InitOwner(device_policy_.policy_data().username(), true);
-  FlushDeviceSettings();
-
-  device_settings_service_.SetManagementSettings(
-      em::PolicyData::CONSUMER_MANAGED,
-      "fake_request_token",
-      "fake_device_id",
-      base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
-                 base::Unretained(this)));
-  FlushDeviceSettings();
-
-  EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
-            device_settings_service_.status());
-  ASSERT_TRUE(device_settings_service_.device_settings());
-
-  // Check that the loaded policy_data contains the expected values.
-  const em::PolicyData* policy_data = device_settings_service_.policy_data();
-  EXPECT_EQ(policy::dm_protocol::kChromeDevicePolicyType,
-            policy_data->policy_type());
-  EXPECT_EQ(device_settings_service_.GetUsername(),
-            policy_data->username());
-  EXPECT_EQ(em::PolicyData::CONSUMER_MANAGED, policy_data->management_mode());
-  EXPECT_EQ("fake_request_token", policy_data->request_token());
-  EXPECT_EQ("fake_device_id", policy_data->device_id());
-}
-
 TEST_F(DeviceSettingsServiceTest, StoreFailure) {
   owner_key_util_->Clear();
   device_settings_test_helper_.set_policy_blob(std::string());