Refactor TestingPrefStore to make it useful to some tests of load errors and asynchrony.

components/policy/core/browser/configuration_policy_pref_store_unittest.cc

Index: components/policy/core/browser/configuration_policy_pref_store_unittest.cc
diff --git a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
index c277253246504a7a0b167dbb81d229247eb41052..7415788e00c885bccfb0168ee54fd19bcf0ce725 100644
--- a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
@@ -176,7 +176,6 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) {
   const base::Value* value = NULL;
   EXPECT_FALSE(store_->GetValue(kTestPolicy, NULL));
 
-  EXPECT_CALL(observer_, OnPrefValueChanged(kTestPref)).Times(1);
   PolicyMap policy;
   policy.Set(kTestPolicy,
              POLICY_LEVEL_MANDATORY,
@@ -184,18 +183,22 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) {
              base::Value::CreateStringValue("http://www.chromium.org"),
              NULL);
   UpdateProviderPolicy(policy);
-  Mock::VerifyAndClearExpectations(&observer_);
+  EXPECT_EQ(1u, observer_.changed_keys.size());
+  if (observer_.changed_keys.size() >= 1)
+    EXPECT_EQ(kTestPref, observer_.changed_keys[0]);
+  observer_.changed_keys.clear();

[Mattias Nissler (ping if slow), 2014/03/27 20:28:05]

Let's add a Reset() member function to PrefStoreObserverMock that clears
internal state.

[erikwright (departed), 2014/03/28 12:29:22]

I assume you mean the VerifyChangedKeyAndReset(), which I think would only reset
the changed_keys, not the initialized state. It makes sense for the observer to
signal a failure if it is unexpectedly initialized again.

[Mattias Nissler (ping if slow), 2014/03/28 12:32:53]

Yes, sounds good.

   EXPECT_TRUE(store_->GetValue(kTestPref, &value));
   EXPECT_TRUE(base::StringValue("http://www.chromium.org").Equals(value));
 
-  EXPECT_CALL(observer_, OnPrefValueChanged(_)).Times(0);
   UpdateProviderPolicy(policy);
-  Mock::VerifyAndClearExpectations(&observer_);
+  EXPECT_TRUE(observer_.changed_keys.empty());
 
-  EXPECT_CALL(observer_, OnPrefValueChanged(kTestPref)).Times(1);
   policy.Erase(kTestPolicy);
   UpdateProviderPolicy(policy);
-  Mock::VerifyAndClearExpectations(&observer_);
+  EXPECT_EQ(1u, observer_.changed_keys.size());
+  if (observer_.changed_keys.size() >= 1)
+    EXPECT_EQ(kTestPref, observer_.changed_keys[0]);
+  observer_.changed_keys.clear();
   EXPECT_FALSE(store_->GetValue(kTestPref, NULL));
 }
 
@@ -203,9 +206,10 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Initialization) {
   EXPECT_FALSE(store_->IsInitializationComplete());
   EXPECT_CALL(provider_, IsInitializationComplete(POLICY_DOMAIN_CHROME))
       .WillRepeatedly(Return(true));
-  EXPECT_CALL(observer_, OnInitializationCompleted(true)).Times(1);
   PolicyMap policy;
   UpdateProviderPolicy(policy);
+  EXPECT_TRUE(observer_.initialized);
+  EXPECT_TRUE(observer_.initialization_success);
   Mock::VerifyAndClearExpectations(&observer_);
   EXPECT_TRUE(store_->IsInitializationComplete());
 }