Clean up PrefServiceBuilder

android_webview/browser/aw_browser_context.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 "android_webview/browser/aw_browser_context.h"
 
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_pref_store.h"
 #include "android_webview/browser/aw_quota_manager_bridge.h"
 #include "android_webview/browser/jni_dependency_factory.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 #include "android_webview/browser/net/init_native_callback.h"
 #include "base/android/path_utils.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
-#include "base/prefs/pref_service_builder.h"
+#include "base/prefs/pref_service_factory.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/user_prefs/user_prefs.h"
 #include "components/visitedlink/browser/visitedlink_master.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 62 matching lines @@
                  << cookie_store_path.AsUTF8Unsafe();
   }
 }
 
 }  // namespace
 
 AwBrowserContext::AwBrowserContext(
     const FilePath path,
     JniDependencyFactory* native_factory)
     : context_storage_path_(path),
-      native_factory_(native_factory),
-      user_pref_service_ready_(false) {
+      native_factory_(native_factory) {
   DCHECK(g_browser_context == NULL);
   g_browser_context = this;
 
   // This constructor is entered during the creation of ContentBrowserClient,
   // before browser threads are created. Therefore any checks to enforce
   // threading (such as BrowserThread::CurrentlyOn()) will fail here.
 }
 
 AwBrowserContext::~AwBrowserContext() {
   DCHECK(g_browser_context == this);
@@ skipping 79 matching lines @@
   }
   return quota_manager_bridge_.get();
 }
 
 AwFormDatabaseService* AwBrowserContext::GetFormDatabaseService() {
   return form_database_service_.get();
 }
 
 // Create user pref service for autofill functionality.
 void AwBrowserContext::CreateUserPrefServiceIfNecessary() {
-  if (user_pref_service_ready_)
+  if (user_pref_service_)
     return;
 
-  user_pref_service_ready_ = true;
   PrefRegistrySimple* pref_registry = new PrefRegistrySimple();
   // We only use the autocomplete feature of the Autofill, which is
   // controlled via the manager_delegate. We don't use the rest
   // of autofill, which is why it is hardcoded as disabled here.
   pref_registry->RegisterBooleanPref(
       autofill::prefs::kAutofillEnabled, false);
   pref_registry->RegisterDoublePref(
       autofill::prefs::kAutofillPositiveUploadRate, 0.0);
   pref_registry->RegisterDoublePref(
       autofill::prefs::kAutofillNegativeUploadRate, 0.0);
 
-  PrefServiceBuilder pref_service_builder;
-  pref_service_builder.WithUserPrefs(new AwPrefStore());
-  pref_service_builder.WithReadErrorCallback(base::Bind(&HandleReadError));
+  base::PrefServiceFactory pref_service_factory;
+  pref_service_factory.set_user_prefs(make_scoped_refptr(new AwPrefStore()));
+  pref_service_factory.set_read_error_callback(base::Bind(&HandleReadError));
+  user_pref_service_ = pref_service_factory.Create(pref_registry).Pass();
 
-  user_prefs::UserPrefs::Set(this,
-                             pref_service_builder.Create(pref_registry));
+  user_prefs::UserPrefs::Set(this, user_pref_service_.get());
 }
 
 base::FilePath AwBrowserContext::GetPath() const {
   return context_storage_path_;
 }
 
 bool AwBrowserContext::IsOffTheRecord() const {
   // Android WebView does not support off the record profile yet.
   return false;
 }
@@ skipping 72 matching lines @@
 
 void AwBrowserContext::RebuildTable(
     const scoped_refptr<URLEnumerator>& enumerator) {
   // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client
   // can change in the lifetime of this WebView and may not yet be set here.
   // Therefore this initialization path is not used.
   enumerator->OnComplete(true);
 }
 
 }  // namespace android_webview