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

remoting/host/setup/native_messaging_host_unittest.cc

 // Copyright 2013 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/host/setup/native_messaging_host.h"
 
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/stringize_macros.h"
 #include "base/values.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_util.h"
 #include "remoting/host/pin_hash.h"
 #include "remoting/host/setup/test_util.h"
 #include "remoting/protocol/pairing_registry.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using remoting::protocol::MockPairingRegistryDelegate;
 using remoting::protocol::PairingRegistry;
-using remoting::protocol::MockPairingRegistryDelegate;
+using remoting::protocol::SynchronousPairingRegistry;
 
 namespace {
 
 void VerifyHelloResponse(const base::DictionaryValue* response) {
   ASSERT_TRUE(response);
   std::string value;
   EXPECT_TRUE(response->GetString("type", &value));
   EXPECT_EQ("helloResponse", value);
   EXPECT_TRUE(response->GetString("version", &value));
   EXPECT_EQ(STRINGIZE(VERSION), value);
@@ skipping 224 matching lines @@
 
 NativeMessagingHostTest::~NativeMessagingHostTest() {}
 
 void NativeMessagingHostTest::SetUp() {
   ASSERT_TRUE(MakePipe(&input_read_handle_, &input_write_handle_));
   ASSERT_TRUE(MakePipe(&output_read_handle_, &output_write_handle_));
 
   daemon_controller_ = new MockDaemonController();
   scoped_ptr<DaemonController> daemon_controller(daemon_controller_);
 
-  scoped_refptr<PairingRegistry> pairing_registry = new PairingRegistry(
-      scoped_ptr<PairingRegistry::Delegate>(new MockPairingRegistryDelegate));
+  scoped_refptr<PairingRegistry> pairing_registry =
+      new SynchronousPairingRegistry(scoped_ptr<PairingRegistry::Delegate>(
+          new MockPairingRegistryDelegate()));
 
   host_.reset(new NativeMessagingHost(daemon_controller.Pass(),
                                       pairing_registry,
                                       input_read_handle_, output_write_handle_,
                                       message_loop_.message_loop_proxy(),
                                       run_loop_.QuitClosure()));
 }
 
 void NativeMessagingHostTest::TearDown() {
   // The NativeMessagingHost dtor closes the handles that are passed to it.
@@ skipping 233 matching lines @@
 
 // Verify rejection if startDaemon request has no "consent" parameter.
 TEST_F(NativeMessagingHostTest, StartDaemonNoConsent) {
   base::DictionaryValue message;
   message.SetString("type", "startDaemon");
   message.Set("config", base::DictionaryValue().DeepCopy());
   TestBadRequest(message);
 }
 
 }  // namespace remoting