SetManagementSettings() is moved to OwnerSettingsServiceChromeOS.

chrome/browser/chromeos/settings/device_settings_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #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"
 #include "chrome/test/base/testing_profile.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "policy/proto/device_management_backend.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace em = enterprise_management;
@@ skipping 14 matching lines @@
 };
 
 }  // namespace
 
 class DeviceSettingsServiceTest : public DeviceSettingsTestBase {
  public:
   void SetOperationCompleted() {
     operation_completed_ = true;
   }
 
+  void OnManagementSettingsSet(bool success) {
+    management_settings_set_ = success;
+    SetOperationCompleted();
+  }
+
   void SetOwnershipStatus(
       DeviceSettingsService::OwnershipStatus ownership_status) {
     ownership_status_ = ownership_status;
   }
 
   void OnIsOwner(bool is_owner) {
     is_owner_ = is_owner;
     is_owner_set_ = true;
   }
 
  protected:
   DeviceSettingsServiceTest()
       : operation_completed_(false),
+        management_settings_set_(false),
         is_owner_(true),
         is_owner_set_(false),
         ownership_status_(DeviceSettingsService::OWNERSHIP_UNKNOWN) {}
 
   virtual void SetUp() override {
     device_policy_.payload().mutable_device_policy_refresh_rate()->
         set_device_policy_refresh_rate(120);
     DeviceSettingsTestBase::SetUp();
   }
 
   void CheckPolicy() {
     ASSERT_TRUE(device_settings_service_.policy_data());
     EXPECT_EQ(device_policy_.policy_data().SerializeAsString(),
               device_settings_service_.policy_data()->SerializeAsString());
     ASSERT_TRUE(device_settings_service_.device_settings());
     EXPECT_EQ(device_policy_.payload().SerializeAsString(),
               device_settings_service_.device_settings()->SerializeAsString());
   }
 
   bool operation_completed_;
+  bool management_settings_set_;
   bool is_owner_;
   bool is_owner_set_;
   DeviceSettingsService::OwnershipStatus ownership_status_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsServiceTest);
 };
 
 TEST_F(DeviceSettingsServiceTest, LoadNoKey) {
   owner_key_util_->Clear();
@@ skipping 54 matching lines @@
 
 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();
 
+  OwnerSettingsServiceChromeOS* service =
+      OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());
+  ASSERT_TRUE(service);
+
   // The initial management mode should be LOCAL_OWNER.
   EXPECT_EQ(em::PolicyData::LOCAL_OWNER,
             device_settings_service_.policy_data()->management_mode());
 
+  OwnerSettingsServiceChromeOS::ManagementSettingsSetRequest
+      management_settings;
+  management_settings.management_mode = em::PolicyData::CONSUMER_MANAGED;
+  management_settings.request_token = "fake_request_token";
+  management_settings.device_id = "fake_device_id";
+  management_settings.callback =
+      base::Bind(&DeviceSettingsServiceTest::OnManagementSettingsSet,
+                 base::Unretained(this));

[Mattias Nissler (ping if slow), 2014/12/01 15:25:41]

It seems like these tests should rather migrate over to
owner_settings_service_chromeos_unittest.cc?

[ygorshenin1, 2014/12/01 15:59:09]

Good point, thanks!

+
   // 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)));
+  service->SetManagementSettings(management_settings);
   FlushDeviceSettings();
 
   EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
-            device_settings_service_.status());
+  EXPECT_TRUE(management_settings_set_);
   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)));
+  management_settings.management_mode = em::PolicyData::ENTERPRISE_MANAGED;
+  service->SetManagementSettings(management_settings);
   FlushDeviceSettings();
 
   EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_POLICY_ERROR,
-            device_settings_service_.status());
+  EXPECT_FALSE(management_settings_set_);
   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)));
+  management_settings.management_mode = em::PolicyData::LOCAL_OWNER;
+  service->SetManagementSettings(management_settings);
   FlushDeviceSettings();
 
   EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
-            device_settings_service_.status());
+  EXPECT_TRUE(management_settings_set_);
   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)));
+  management_settings.management_mode = em::PolicyData::ENTERPRISE_MANAGED;
+  service->SetManagementSettings(management_settings);
   FlushDeviceSettings();
 
   EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_POLICY_ERROR,
-            device_settings_service_.status());
+  EXPECT_FALSE(management_settings_set_);
   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)));
+  management_settings.management_mode = em::PolicyData::LOCAL_OWNER;
+  service->SetManagementSettings(management_settings);
   FlushDeviceSettings();
 
   EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_POLICY_ERROR,
-            device_settings_service_.status());
+  EXPECT_FALSE(management_settings_set_);
   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)));
+  management_settings.management_mode = em::PolicyData::CONSUMER_MANAGED;
+  service->SetManagementSettings(management_settings);
   FlushDeviceSettings();
 
   EXPECT_TRUE(operation_completed_);
-  EXPECT_EQ(DeviceSettingsService::STORE_POLICY_ERROR,
-            device_settings_service_.status());
+  EXPECT_FALSE(management_settings_set_);
   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)));
+  OwnerSettingsServiceChromeOS* service =
+      OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());
+  ASSERT_TRUE(service);
+  OwnerSettingsServiceChromeOS::ManagementSettingsSetRequest request;
+  request.management_mode = em::PolicyData::CONSUMER_MANAGED;
+  request.request_token = "fake_request_token";
+  request.device_id = "fake_device_id";
+  request.callback =
+      base::Bind(&DeviceSettingsServiceTest::OnManagementSettingsSet,
+                 base::Unretained(this));
+  service->SetManagementSettings(request);
   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,
@@ skipping 312 matching lines @@
   EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
   EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
   device_settings_service_.PropertyChangeComplete(true);
   FlushDeviceSettings();
   Mock::VerifyAndClearExpectations(&observer_);
 
   device_settings_service_.RemoveObserver(&observer_);
 }
 
 }  // namespace chromeos