Refactored PairingRegistry::Delegate such that it can retrieve/modify for a single client.

remoting/protocol/pairing_registry_unittest.cc

Index: remoting/protocol/pairing_registry_unittest.cc
diff --git a/remoting/protocol/pairing_registry_unittest.cc b/remoting/protocol/pairing_registry_unittest.cc
index f564256c335bdc60d723f63a840a2617ab2dccdf..151d8676cd9fda7f54cc2450ed1e45e128344fdc 100644
--- a/remoting/protocol/pairing_registry_unittest.cc
+++ b/remoting/protocol/pairing_registry_unittest.cc
@@ -82,9 +82,9 @@ TEST_F(PairingRegistryTest, CreateAndGetPairings) {
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("my_client");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("my_client");

[Jamie, 2013/07/30 21:35:07]

I think a lot of these DrainCallbacks are redundant. You only really need one at
the end of each test, perhaps followed by an appropriate EXPECT_EQ for
callback_count_. The only case where you might want more than one is to get a
better sense for where the test fails by using multiple EXPECT_EQ statements (as
we do in this test).

[alexeypa (please no reviews), 2013/07/31 21:31:24]

Done.

-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   EXPECT_NE(pairing_1.shared_secret(), pairing_2.shared_secret());
 
@@ -92,7 +92,7 @@ TEST_F(PairingRegistryTest, CreateAndGetPairings) {
                        base::Bind(&PairingRegistryTest::ExpectSecret,
                                   base::Unretained(this),
                                   pairing_1.shared_secret()));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   EXPECT_EQ(1, callback_count_);
 
   // Check that the second client is paired with a different shared secret.
@@ -100,7 +100,7 @@ TEST_F(PairingRegistryTest, CreateAndGetPairings) {
                        base::Bind(&PairingRegistryTest::ExpectSecret,
                                   base::Unretained(this),
                                   pairing_2.shared_secret()));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   EXPECT_EQ(2, callback_count_);
 }
 
@@ -111,14 +111,14 @@ TEST_F(PairingRegistryTest, GetAllPairings) {
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::set_pairings,
                  base::Unretained(this)));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   ASSERT_EQ(2u, pairings_->GetSize());
   const base::DictionaryValue* actual_pairing_1;
@@ -145,21 +145,21 @@ TEST_F(PairingRegistryTest, DeletePairing) {
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   registry->DeletePairing(
       pairing_1.client_id(),
       base::Bind(&PairingRegistryTest::ExpectSaveSuccess,
                  base::Unretained(this)));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   // Re-read the list, and verify it only has the pairing_2 client.
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::set_pairings,
                  base::Unretained(this)));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   ASSERT_EQ(1u, pairings_->GetSize());
   const base::DictionaryValue* actual_pairing_2;
@@ -177,9 +177,9 @@ TEST_F(PairingRegistryTest, ClearAllPairings) {
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
   PairingRegistry::Pairing pairing_2 = registry->CreatePairing("client2");
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   registry->ClearAllPairings(
       base::Bind(&PairingRegistryTest::ExpectSaveSuccess,
@@ -189,7 +189,7 @@ TEST_F(PairingRegistryTest, ClearAllPairings) {
   registry->GetAllPairings(
       base::Bind(&PairingRegistryTest::set_pairings,
                  base::Unretained(this)));
-  mock_delegate->RunCallback();
+  mock_delegate->DrainCallbacks();
 
   EXPECT_TRUE(pairings_->empty());
 }
@@ -198,7 +198,6 @@ TEST_F(PairingRegistryTest, SerializedRequests) {
   MockPairingRegistryDelegate* mock_delegate =
       new MockPairingRegistryDelegate();
   scoped_ptr<PairingRegistry::Delegate> delegate(mock_delegate);
-  mock_delegate->set_run_save_callback_automatically(false);
 
   scoped_refptr<PairingRegistry> registry(new PairingRegistry(delegate.Pass()));
   PairingRegistry::Pairing pairing_1 = registry->CreatePairing("client1");
@@ -235,9 +234,7 @@ TEST_F(PairingRegistryTest, SerializedRequests) {
       base::Bind(&PairingRegistryTest::ExpectClientName,
                  base::Unretained(this), "client3"));
 
-  while (mock_delegate->HasCallback()) {
-    mock_delegate->RunCallback();
-  }
+  mock_delegate->DrainCallbacks();
 
   EXPECT_EQ(8, callback_count_);
 }