Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/chrome_pref_service_factory.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/prefs/chrome_pref_service_factory.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/json_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_notifier_impl.h"
+#include "chrome/browser/prefs/pref_registry.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_service_syncable_builder.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
@@ skipping 64 matching lines @@
 
 }  // namespace
 
 // TODO(joi): Find a better home for this.
 PrefServiceBase* PrefServiceBase::FromBrowserContext(BrowserContext* context) {
   return static_cast<Profile*>(context)->GetPrefs();
 }
 
 namespace chrome_prefs {
 
-PrefServiceSimple* CreateLocalState(
+PrefService* CreateLocalState(
     const FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
     PrefStore* extension_prefs,
+    scoped_ptr<PrefRegistry> pref_registry,
     bool async) {

[Mattias Nissler (ping if slow), 2013/01/25 14:57:11]

Maybe we should move the browser_prefs::RegisterLocalState call here?

[Jói, 2013/01/29 16:10:02]

That could be done once the TODO around line 263 of chrome_browser_main.cc (use
a JSONPrefStore instead of an entire PrefService) has been done. Until then,
this would cause an unnecessary call to browser_prefs::RegisterLocalState, which
is pretty expensive.

I've updated the TODO in chrome_browser_main.cc to say this can be fixed once
the TODO is addressed.

   PrefServiceSyncableBuilder builder;
   PrepareBuilder(&builder,
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
                  extension_prefs,
                  async);
-  return builder.CreateSimple();
+  return builder.Create(pref_registry.Pass());
 }
 
 PrefServiceSyncable* CreateProfilePrefs(
     const FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
     PrefStore* extension_prefs,
     bool async) {
   PrefServiceSyncableBuilder builder;
   PrepareBuilder(&builder,
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
                  extension_prefs,
                  async);
   return builder.CreateSyncable();
 }
 
 }  // namespace chrome_prefs