Add serialization to PairingRegistry.

remoting/protocol/protocol_mock_objects.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_
 #define REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_
 
 #include <string>
 
 #include "net/base/ip_endpoint.h"
@@ skipping 204 matching lines @@
     return pairings_json_;
   }
 
   // PairingRegistry::Delegate implementation.
   virtual void Save(
       const std::string& pairings_json,
       const PairingRegistry::SaveCallback& callback) OVERRIDE;
   virtual void Load(
       const PairingRegistry::LoadCallback& callback) OVERRIDE;
 
+  // By default, the Save method runs its callback automatically because the
+  // negotiating authenticator unit test does not provide any hooks to do it
+  // manually. For unit tests that need to verify correct behaviour under

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

optional: I think it's strange to have the negotiating authenticator run one set
of callbacks automatically, but not another set. I'd prefer all or nothing.
Consider updating the negotiating authenticator tests.

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

I think it makes sense because the focus of the tests is different. Here, we're
specifically testing the asynchronous nature of the pairing registry, so we need
to be able to control when the callbacks fire. The the negotiating authenticator
test, the focus is on the overall flow, so there's no need to add to the overall
complexity.

+  // asynchronous conditions, use this method to disable this feature and call
+  // RunCallback as appropriate.
+  void set_run_save_callback_automatically(
+      bool run_save_callback_automatically) {
+    run_save_callback_automatically_ = run_save_callback_automatically;
+  }
+
+  bool HasCallback() {
+    return !load_callback_.is_null() || !save_callback_.is_null();

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

nit: Move to .cc file? I think clang might trigger on inlined methods that are
"too complex"?
Also, should be const.

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

I've made it const, but I think this is simple enough to be inlined, and clang
agrees :)

+  }
+
+  // Run either the save or the load callback (whichever was set most recently;
+  // it is an error for both of these to be set at the same time).
   void RunCallback();
 
  private:
+  void SetPairingsJsonAndRunCallback(
+      const std::string& pairings_json,
+      const PairingRegistry::SaveCallback& callback);
+
   base::Closure load_callback_;
+  base::Closure save_callback_;
   std::string pairings_json_;
+  bool run_save_callback_automatically_;
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_