Add serialization to PairingRegistry.

remoting/protocol/protocol_mock_objects.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 "remoting/protocol/protocol_mock_objects.h"
 
 namespace remoting {
 namespace protocol {
 
 MockConnectionToClient::MockConnectionToClient(
@@ skipping 30 matching lines @@
 MockVideoStub::~MockVideoStub() {}
 
 MockSession::MockSession() {}
 
 MockSession::~MockSession() {}
 
 MockSessionManager::MockSessionManager() {}
 
 MockSessionManager::~MockSessionManager() {}
 
-MockPairingRegistryDelegate::MockPairingRegistryDelegate() {
+MockPairingRegistryDelegate::MockPairingRegistryDelegate()
+    : run_save_callback_automatically_(true) {
 }
 
 MockPairingRegistryDelegate::~MockPairingRegistryDelegate() {
 }
 
 void MockPairingRegistryDelegate::Save(
     const std::string& pairings_json,
     const PairingRegistry::SaveCallback& callback) {
+  DCHECK(load_callback_.is_null());

[Lambros, 2013/07/18 20:34:51]

Use ASSERT_TRUE here and elsewhere instead of DCHECK.

[Jamie, 2013/07/18 22:44:56]

Done.

+  DCHECK(save_callback_.is_null());
+  if (run_save_callback_automatically_) {
+    SetPairingsJsonAndRunCallback(pairings_json, callback);
+  } else {
+    save_callback_ = base::Bind(
+        &MockPairingRegistryDelegate::SetPairingsJsonAndRunCallback,
+        base::Unretained(this), pairings_json, callback);
+  }
+}
+
+void MockPairingRegistryDelegate::SetPairingsJsonAndRunCallback(
+    const std::string& pairings_json,
+    const PairingRegistry::SaveCallback& callback) {
   pairings_json_ = pairings_json;
   if (!callback.is_null()) {
     callback.Run(true);
   }
 }
 
 void MockPairingRegistryDelegate::Load(
     const PairingRegistry::LoadCallback& callback) {
+  DCHECK(load_callback_.is_null());
+  DCHECK(save_callback_.is_null());
   load_callback_ = base::Bind(base::Bind(callback), pairings_json_);

[Lambros, 2013/07/18 20:34:51]

optional: Remove inner base::Bind ?

 }
 
 void MockPairingRegistryDelegate::RunCallback() {
-  DCHECK(!load_callback_.is_null());
-  load_callback_.Run();
-  load_callback_.Reset();
+  DCHECK(load_callback_.is_null() ^ save_callback_.is_null());

[Lambros, 2013/07/18 20:34:51]

Split this up, otherwise the test output won't tell you whether they were both
set or both unset.

Maybe something like:

if (have load callback) {
  EXPECT_TRUE(save is null);
  ...
} else if (have save callback) {
  EXPECT_TRUE(load is null);
  ...
} else {
  ADD_FAILURE() << "RunCallback() called without any callbacks set";
}

[Jamie, 2013/07/18 22:44:56]

Done.

+  if (!load_callback_.is_null()) {
+    base::Closure load_callback = load_callback_;
+    load_callback_.Reset();
+    load_callback.Run();
+  } else {
+    base::Closure save_callback = save_callback_;
+    save_callback_.Reset();
+    save_callback.Run();
+  }
 }
 
 }  // namespace protocol
 }  // namespace remoting