Changes to PairingRegistry to facilitate per-platform implementions.

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 169 matching lines @@
  public:
   MockSessionManager();
   virtual ~MockSessionManager();
 
   MOCK_METHOD2(Init, void(SignalStrategy*, Listener*));
   MOCK_METHOD3(ConnectPtr, Session*(
       const std::string& host_jid,
       Authenticator* authenticator,
       CandidateSessionConfig* config));
   MOCK_METHOD0(Close, void());
-  MOCK_METHOD1(set_authenticator_factory_ptr, void(AuthenticatorFactory*));
+  MOCK_METHOD1(set_authenticator_factory_ptr,
+               void(AuthenticatorFactory* factory));
   virtual scoped_ptr<Session> Connect(
       const std::string& host_jid,
       scoped_ptr<Authenticator> authenticator,
       scoped_ptr<CandidateSessionConfig> config) {
     return scoped_ptr<Session>(ConnectPtr(
         host_jid, authenticator.get(), config.get()));
-  };
+  }
   virtual void set_authenticator_factory(
       scoped_ptr<AuthenticatorFactory> authenticator_factory) {
     set_authenticator_factory_ptr(authenticator_factory.release());
-  };
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSessionManager);
 };
 
 // Simple delegate that caches information on paired clients in memory.
 class MockPairingRegistryDelegate : public PairingRegistry::Delegate {
  public:
   MockPairingRegistryDelegate();
   virtual ~MockPairingRegistryDelegate();
 
   const PairingRegistry::PairedClients& paired_clients() const {
     return paired_clients_;
   }
 
   // PairingRegistry::Delegate implementation.
   virtual void AddPairing(
-      const PairingRegistry::Pairing& new_paired_client) OVERRIDE;
+      const PairingRegistry::Pairing& new_paired_client,
+      const PairingRegistry::AddPairingCallback& callback) OVERRIDE;
   virtual void GetPairing(
       const std::string& client_id,
       const PairingRegistry::GetPairingCallback& callback) OVERRIDE;
 
   void RunCallback();
 
  private:
   base::Closure saved_callback_;
   PairingRegistry::PairedClients paired_clients_;
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_