Add calls to store/retrieve user policy to SessionManagerClient.

chrome/browser/chromeos/login/signed_settings_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/login/signed_settings.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 216 matching lines @@
   s->Execute();
   message_loop_.RunAllPending();
 
   // Fake out a successful signing.
   std::string signed_serialized;
   em::PolicyFetchResponse signed_policy = BuildProto(data_serialized,
                                                      fake_signature_,
                                                      &signed_serialized);
   MockSessionManagerClient* client =
       mock_dbus_thread_manager_->mock_session_manager_client();
-  EXPECT_CALL(*client, StorePolicy(signed_serialized, _))
+  EXPECT_CALL(*client, StoreDevicePolicy(signed_serialized, _))
       .WillOnce(Store(true))
       .RetiresOnSaturation();
   s->OnKeyOpComplete(OwnerManager::SUCCESS, fake_value_signature_);
   message_loop_.RunAllPending();
 }
 
 TEST_F(SignedSettingsTest, StoreSignedPolicy) {
   NormalDelegate<bool> d(true);
   d.expect_success();
 
   em::PolicyData in_pol = BuildPolicyData(std::vector<std::string>());
   std::string serialized = in_pol.SerializeAsString();
   std::string signed_serialized;
   em::PolicyFetchResponse signed_policy = BuildProto(serialized,
                                                      fake_signature_,
                                                      &signed_serialized);
   scoped_refptr<SignedSettings> s(
       SignedSettings::CreateStorePolicyOp(&signed_policy, &d));
   MockSessionManagerClient* client =
       mock_dbus_thread_manager_->mock_session_manager_client();
-  EXPECT_CALL(*client, StorePolicy(signed_serialized, _))
+  EXPECT_CALL(*client, StoreDevicePolicy(signed_serialized, _))
       .WillOnce(Store(true))
       .RetiresOnSaturation();
 
   mock_service(s.get(), &m_);
   em::PolicyData out_pol;
 
   s->Execute();
   message_loop_.RunAllPending();
 }
 
@@ skipping 26 matching lines @@
   std::string signed_serialized;
   em::PolicyFetchResponse signed_policy = BuildProto(serialized,
                                                      fake_signature_,
                                                      &signed_serialized);
   ProtoDelegate d(signed_policy);
   d.expect_success();
   scoped_refptr<SignedSettings> s(SignedSettings::CreateRetrievePolicyOp(&d));
 
   MockSessionManagerClient* client =
       mock_dbus_thread_manager_->mock_session_manager_client();
-  EXPECT_CALL(*client, RetrievePolicy(_))
+  EXPECT_CALL(*client, RetrieveDevicePolicy(_))
       .WillOnce(Retrieve(signed_serialized))
       .RetiresOnSaturation();
 
   mock_service(s.get(), &m_);
   EXPECT_CALL(m_, StartVerifyAttempt(serialized, fake_value_signature_, _))
       .Times(1);
   em::PolicyData out_pol;
 
   s->Execute();
   message_loop_.RunAllPending();
 
   s->OnKeyOpComplete(OwnerManager::SUCCESS, std::vector<uint8>());
   message_loop_.RunAllPending();
 }
 
 TEST_F(SignedSettingsTest, RetrieveNullPolicy) {
   em::PolicyFetchResponse policy;
   ProtoDelegate d(policy);
   d.expect_failure(SignedSettings::NOT_FOUND);
   scoped_refptr<SignedSettings> s(SignedSettings::CreateRetrievePolicyOp(&d));
 
   MockSessionManagerClient* client =
       mock_dbus_thread_manager_->mock_session_manager_client();
-  EXPECT_CALL(*client, RetrievePolicy(_))
+  EXPECT_CALL(*client, RetrieveDevicePolicy(_))
       .WillOnce(Retrieve(""))
       .RetiresOnSaturation();
 
   s->Execute();
   message_loop_.RunAllPending();
 }
 
 TEST_F(SignedSettingsTest, RetrieveEmptyPolicy) {
   std::string serialized;
   em::PolicyFetchResponse policy = BuildProto("", "", &serialized);
   ProtoDelegate d(policy);
   d.expect_failure(SignedSettings::NOT_FOUND);
   scoped_refptr<SignedSettings> s(SignedSettings::CreateRetrievePolicyOp(&d));
 
   MockSessionManagerClient* client =
       mock_dbus_thread_manager_->mock_session_manager_client();
-  EXPECT_CALL(*client, RetrievePolicy(_))
+  EXPECT_CALL(*client, RetrieveDevicePolicy(_))
       .WillOnce(Retrieve(""))
       .RetiresOnSaturation();
 
   s->Execute();
   message_loop_.RunAllPending();
 }
 
 TEST_F(SignedSettingsTest, RetrieveUnsignedPolicy) {
   std::string serialized;
   em::PolicyFetchResponse policy = BuildProto(fake_prop_,
                                               std::string(),
                                               &serialized);
   ProtoDelegate d(policy);
   d.expect_failure(SignedSettings::BAD_SIGNATURE);
   scoped_refptr<SignedSettings> s(SignedSettings::CreateRetrievePolicyOp(&d));
 
   MockSessionManagerClient* client =
       mock_dbus_thread_manager_->mock_session_manager_client();
-  EXPECT_CALL(*client, RetrievePolicy(_))
+  EXPECT_CALL(*client, RetrieveDevicePolicy(_))
       .WillOnce(Retrieve(serialized))
       .RetiresOnSaturation();
 
   s->Execute();
   message_loop_.RunAllPending();
 }
 
 TEST_F(SignedSettingsTest, RetrieveMalsignedPolicy) {
   std::string signed_serialized;
   em::PolicyFetchResponse signed_policy = BuildProto(fake_prop_,
                                                      fake_signature_,
                                                      &signed_serialized);
   ProtoDelegate d(signed_policy);
   d.expect_failure(SignedSettings::BAD_SIGNATURE);
   scoped_refptr<SignedSettings> s(SignedSettings::CreateRetrievePolicyOp(&d));
 
   MockSessionManagerClient* client =
       mock_dbus_thread_manager_->mock_session_manager_client();
-  EXPECT_CALL(*client, RetrievePolicy(_))
+  EXPECT_CALL(*client, RetrieveDevicePolicy(_))
       .WillOnce(Retrieve(signed_serialized))
       .RetiresOnSaturation();
 
   mock_service(s.get(), &m_);
   EXPECT_CALL(m_, StartVerifyAttempt(fake_prop_, fake_value_signature_, _))
       .Times(1);
 
   s->Execute();
   message_loop_.RunAllPending();
 
   s->OnKeyOpComplete(OwnerManager::OPERATION_FAILED, std::vector<uint8>());
   message_loop_.RunAllPending();
 }
 
 }  // namespace chromeos