Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*.

chrome/browser/chromeos/settings/session_manager_operation_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/session_manager_operation.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.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_factory.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_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/ownership/mock_owner_key_util.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
 #include "components/policy/core/common/cloud/policy_builder.h"
 #include "content/public/test/test_browser_thread.h"
 #include "crypto/rsa_private_key.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;
 
 using testing::Mock;
 using testing::_;
 
 namespace chromeos {
 
 class SessionManagerOperationTest : public testing::Test {
  public:
   SessionManagerOperationTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         file_thread_(content::BrowserThread::FILE, &message_loop_),
         owner_key_util_(new ownership::MockOwnerKeyUtil()),
         validated_(false) {
-    OwnerSettingsServiceChromeOSFactory::GetInstance()
-        ->SetOwnerKeyUtilForTesting(owner_key_util_);
+    OwnerSettingsServiceFactory::GetInstance()->SetOwnerKeyUtilForTesting(
+        owner_key_util_);
   }
 
   virtual void SetUp() OVERRIDE {
     policy_.payload().mutable_pinned_apps()->add_app_id("fake-app");
     policy_.Build();
 
     profile_.reset(new TestingProfile());
-    service_ =
-        OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get());
+    service_ = OwnerSettingsServiceFactory::GetForProfile(profile_.get());
   }
 
   MOCK_METHOD2(OnOperationCompleted,
                void(SessionManagerOperation*, DeviceSettingsService::Status));
 
   void CheckSuccessfulValidation(
       policy::DeviceCloudPolicyValidator* validator) {
     EXPECT_TRUE(validator->success());
     EXPECT_TRUE(validator->payload().get());
     EXPECT_EQ(validator->payload()->SerializeAsString(),
@@ skipping 12 matching lines @@
  protected:
   base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   policy::DevicePolicyBuilder policy_;
   DeviceSettingsTestHelper device_settings_test_helper_;
   scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
 
   scoped_ptr<TestingProfile> profile_;
-  OwnerSettingsServiceChromeOS* service_;
+  OwnerSettingsService* service_;
 
   bool validated_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionManagerOperationTest);
 };
 
 TEST_F(SessionManagerOperationTest, LoadNoPolicyNoKey) {
   LoadSettingsOperation op(
       base::Bind(&SessionManagerOperationTest::OnOperationCompleted,
@@ skipping 117 matching lines @@
 
 TEST_F(SessionManagerOperationTest, SignAndStoreSettings) {
   owner_key_util_->SetPrivateKey(policy_.GetSigningKey());
   service_->OnTPMTokenReady(true /* is ready */);
 
   scoped_ptr<em::PolicyData> policy(new em::PolicyData(policy_.policy_data()));
   SignAndStoreSettingsOperation op(
       base::Bind(&SessionManagerOperationTest::OnOperationCompleted,
                  base::Unretained(this)),
       policy.Pass());
-  op.set_owner_settings_service(service_->as_weak_ptr());
+  op.set_delegate(service_->as_weak_ptr());
 
   EXPECT_CALL(*this,
               OnOperationCompleted(
                   &op, DeviceSettingsService::STORE_SUCCESS));
   op.Start(&device_settings_test_helper_, owner_key_util_, NULL);
   device_settings_test_helper_.Flush();
   Mock::VerifyAndClearExpectations(this);
 
   // The blob should validate.
   scoped_ptr<em::PolicyFetchResponse> policy_response(
@@ skipping 32 matching lines @@
   message_loop_.RunUntilIdle();
   EXPECT_TRUE(validated_);
 
   // Loaded device settings should match what the operation received.
   ASSERT_TRUE(op.device_settings().get());
   EXPECT_EQ(policy_.payload().SerializeAsString(),
             op.device_settings()->SerializeAsString());
 }
 
 }  // namespace chromeos