Add calls to store/retrieve user policy to SessionManagerClient.

chrome/browser/chromeos/login/signed_settings_helper_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_helper.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
@@ skipping 40 matching lines @@
     std::string data_serialized = fake_policy_data_.SerializeAsString();
     std::string serialized_policy_;
     fake_policy_ = BuildProto(data_serialized,
                               std::string("false"),
                               &serialized_policy_);
 
     MockSessionManagerClient* client =
         mock_dbus_thread_manager_->mock_session_manager_client();
     // Make sure the mocked out class calls back to notify success on store and
     // retrieve ops.
-    EXPECT_CALL(*client, StorePolicy(_, _))
+    EXPECT_CALL(*client, StoreDevicePolicy(_, _))
         .WillRepeatedly(Store(true));
-    EXPECT_CALL(*client, RetrievePolicy(_))
+    EXPECT_CALL(*client, RetrieveDevicePolicy(_))
         .WillRepeatedly(Retrieve(serialized_policy_));
 
     EXPECT_CALL(m_, StartSigningAttempt(_, A<OwnerManager::Delegate*>()))
         .WillRepeatedly(WithArg<1>(
             Invoke(&SignedSettingsHelperTest::OnKeyOpComplete)));
     EXPECT_CALL(m_, StartVerifyAttempt(_, _, A<OwnerManager::Delegate*>()))
         .WillRepeatedly(WithArg<2>(
             Invoke(&SignedSettingsHelperTest::OnKeyOpComplete)));
   }
 
@@ skipping 125 matching lines @@
                  base::Unretained(&cb)));
   SignedSettingsHelper::Get()->StartRetrievePolicyOp(
       base::Bind(&MockSignedSettingsCallbacks::OnRetrievePolicyCompleted,
                  base::Unretained(&cb)));
 
   message_loop_.RunAllPending();
   ASSERT_EQ(0, pending_ops_);
 }
 
 }  // namespace chromeos