Pref service: Merge PrefStoreConnector interfaces.

services/preferences/pref_service_factory_unittest.cc

Index: services/preferences/pref_service_factory_unittest.cc
diff --git a/services/preferences/pref_service_factory_unittest.cc b/services/preferences/pref_service_factory_unittest.cc
index a77ff7a816dd672e7f172cf7ffaea2eca8d4323a..462d0d34deb83482a467c4973c4fe078b7e69f69 100644
--- a/services/preferences/pref_service_factory_unittest.cc
+++ b/services/preferences/pref_service_factory_unittest.cc
@@ -137,8 +137,13 @@ class PrefServiceFactoryTest : public base::MessageLoop::DestructionObserver,
                        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,