Pref service: Merge PrefStoreConnector interfaces.

services/preferences/pref_service_factory_unittest.cc

 // Copyright (c) 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_service_factory.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/sequenced_worker_pool_owner.h"
@@ skipping 119 matching lines @@
   static void OnInit(const base::Closure& quit_closure, bool success) {
     quit_closure.Run();
   }
 
   // Called when the PrefService has been created.
   static void OnCreate(const base::Closure& quit_closure,
                        std::unique_ptr<PrefService>* out,
                        std::unique_ptr<PrefService> pref_service) {
     DCHECK(pref_service);
     *out = std::move(pref_service);
-    (*out)->AddPrefInitObserver(
-        base::Bind(PrefServiceFactoryTest::OnInit, quit_closure));
+    if ((*out)->GetInitializationStatus() ==
+        PrefService::INITIALIZATION_STATUS_WAITING) {
+      (*out)->AddPrefInitObserver(
+          base::Bind(PrefServiceFactoryTest::OnInit, quit_closure));
+      return;
+    }
+    quit_closure.Run();
   }
 
   static void OnPrefChanged(const base::Closure& quit_closure,
                             const std::string& expected_path,
                             const std::string& path) {
     if (path == expected_path)
       quit_closure.Run();
   }
 
   base::ScopedTempDir profile_dir_;
@@ skipping 19 matching lines @@
 
   // TODO(tibell): Once we have a default store check the value prior to
   // setting.
   pref_service->SetInteger(kKey, kUpdatedValue);
   WaitForPrefChange(pref_service2.get(), kKey);
   EXPECT_EQ(kUpdatedValue, pref_service2->GetInteger(kKey));
 }
 
 }  // namespace
 }  // namespace prefs