Pref service: Merge connectors and send a PrefRegistry in Connect().

services/preferences/public/cpp/tests/pref_store_client_unittest.cc

 // Copyright 2017 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 "services/preferences/public/cpp/pref_store_client.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 10 matching lines @@
 namespace prefs {
 
 namespace {
 
 class PrefStoreObserverMock : public PrefStore::Observer {
  public:
   MOCK_METHOD1(OnPrefValueChanged, void(const std::string&));
   MOCK_METHOD1(OnInitializationCompleted, void(bool succeeded));
 };
 
-class PrefStoreConnectorMock : public mojom::PrefStoreConnector {
- public:
-  MOCK_METHOD1(Connect, void(const ConnectCallback&));
-};
-
 }  // namespace
 
 class PrefStoreClientTest : public testing::Test {
  public:
   PrefStoreClientTest() = default;
   ~PrefStoreClientTest() override {}
 
   PrefStoreObserverMock& observer() { return observer_; }
   PrefStoreClient* store() { return store_.get(); }
 
@@ skipping 137 matching lines @@
   EXPECT_TRUE(value->GetAsInteger(&actual_value));
   EXPECT_EQ(kValue, actual_value);
   EXPECT_CALL(observer, OnInitializationCompleted(_)).Times(0);
   EXPECT_CALL(observer, OnPrefValueChanged(_)).Times(0);
   observer_ptr.FlushForTesting();
 
   store->RemoveObserver(&observer);
 }
 
 }  // namespace prefs