Signed settings refactoring: Proper caching and more tests.

chrome/browser/chromeos/login/mock_signed_settings_helper.h

Index: chrome/browser/chromeos/login/mock_signed_settings_helper.h
diff --git a/chrome/browser/chromeos/login/mock_signed_settings_helper.h b/chrome/browser/chromeos/login/mock_signed_settings_helper.h
index 628b5527fd4b88390c9c816e195608c9c2bc9bc4..162fed15bb8aa5c48698b36aae0d0f971023bc09 100644
--- a/chrome/browser/chromeos/login/mock_signed_settings_helper.h
+++ b/chrome/browser/chromeos/login/mock_signed_settings_helper.h
@@ -17,25 +17,22 @@ class MockSignedSettingsHelper : public chromeos::SignedSettingsHelper {
   MockSignedSettingsHelper();
   virtual ~MockSignedSettingsHelper();
 
-  MOCK_METHOD3(StartStorePropertyOp,
-               void(const std::string&, const base::Value&, Callback*));
-  MOCK_METHOD2(StartRetrieveProperty,
-               void(const std::string&, Callback*));
   MOCK_METHOD2(StartStorePolicyOp,
-               void(const em::PolicyFetchResponse&, Callback*));
-  MOCK_METHOD1(StartRetrievePolicyOp, void(Callback* callback));
-  MOCK_METHOD1(CancelCallback, void(Callback*));
+               void(const em::PolicyFetchResponse&,
+                    SignedSettingsHelper::StorePolicyCallback));
+  MOCK_METHOD1(StartRetrievePolicyOp,
+               void(SignedSettingsHelper::RetrievePolicyCallback));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSignedSettingsHelper);
 };
 
 ACTION_P(MockSignedSettingsHelperStorePolicy, status_code) {
-  arg1->OnStorePolicyCompleted(status_code);
+  arg1.Run(status_code);
 }
 
 ACTION_P2(MockSignedSettingsHelperRetrievePolicy, status_code, policy) {
-  arg0->OnRetrievePolicyCompleted(status_code, policy);
+  arg0.Run(status_code, policy);
 }
 
 }  // namespace chromeos