Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/extensions/test_extension_prefs.cc

 // 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.
 
 #include "chrome/browser/extensions/test_extension_prefs.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/run_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_prefs.h"
-#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
+#include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace extensions {
@@ skipping 53 matching lines @@
             base::Bind(&base::DoNothing),
             run_loop.QuitClosure()));
     run_loop.Run();
   }
 
   extension_pref_value_map_.reset(new ExtensionPrefValueMap);
   PrefServiceMockBuilder builder;
   builder.WithUserFilePrefs(preferences_file_, task_runner_);
   builder.WithExtensionPrefs(
       new ExtensionPrefStore(extension_pref_value_map_.get(), false));
-  pref_service_.reset(builder.CreateSyncable());
-  ExtensionPrefs::RegisterUserPrefs(pref_service_.get());
+  scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

As mentioned elsewhere, it would probably be nice to be able to pass in the
registry to use here.

As a step in the right direction, we could make the registry a member of
TestExtensionPrefs and let the tests access it?

[Jói, 2013/02/07 14:52:32]

Done.

+  pref_service_.reset(builder.CreateSyncable(registry));
+  ExtensionPrefs::RegisterUserPrefs(registry);

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

For good measure, can we swap lines 98 and 99?

[Jói, 2013/02/07 14:52:32]

Done.

 
   prefs_ = ExtensionPrefs::Create(
       pref_service_.get(),
       temp_dir_.path(),
       extension_pref_value_map_.get(),
       extensions_disabled_,
       // Guarantee that no two extensions get the same installation time
       // stamp and we can reliably assert the installation order in the tests.
       scoped_ptr<ExtensionPrefs::TimeProvider>(
           new IncrementalTimeProvider()));
@@ skipping 51 matching lines @@
 PrefServiceSyncable* TestExtensionPrefs::CreateIncognitoPrefService() const {
   return pref_service_->CreateIncognitoPrefService(
       new ExtensionPrefStore(extension_pref_value_map_.get(), true));
 }
 
 void TestExtensionPrefs::set_extensions_disabled(bool extensions_disabled) {
   extensions_disabled_ = extensions_disabled;
 }
 
 }  // namespace extensions