Clean up PrefServiceBuilder

chrome_frame/test/reliability/page_load_test.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.
 //
 // This file provides reliablity tests which run for ChromeFrame.
 //
 // Usage:
 // <reliability test exe> --list=file --startline=start --endline=end [...]
 // Upon invocation, it visits each of the URLs on line numbers between start
 // and end, inclusive, stored in the input file. The line number starts from 1.
@@ skipping 20 matching lines @@
 #include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_value_store.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_file_util.h"
 #include "base/time/time.h"
-#include "chrome/browser/prefs/pref_service_mock_builder.h"
+#include "chrome/browser/prefs/pref_service_mock_factory.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
@@ skipping 375 matching lines @@
     if (metrics)
       metrics->crash_dump_count = num_dumps;
   }
 
   // Get a PrefService whose contents correspond to the Local State file
   // that was saved by the app as it closed.  The caller takes ownership of the
   // returned PrefService object.
   PrefService* GetLocalState(PrefRegistry* registry) {
     base::FilePath path;
     chrome::GetChromeFrameUserDataDirectory(&path);
-    PrefServiceMockBuilder builder;
-    builder.WithUserFilePrefs(
+    PrefServiceMockFactory factory;
+    factory.SetUserPrefsFile(
         path,
         JsonPrefStore::GetTaskRunnerForFile(
             path, content::BrowserThread::GetBlockingPool()));
-    return builder.Create(registry);
+    return factory.Create(registry).release();
   }
 
   void GetStabilityMetrics(NavigationMetrics* metrics) {
     if (!metrics)
       return;
     scoped_refptr<PrefRegistrySimple> registry = new PrefRegistrySimple();
     registry->RegisterBooleanPref(prefs::kStabilityExitedCleanly, false);
     registry->RegisterIntegerPref(prefs::kStabilityExecutionPhase, 0);
     registry->RegisterIntegerPref(prefs::kStabilityLaunchCount, -1);
     registry->RegisterIntegerPref(prefs::kStabilityPageLoadCount, -1);
@@ skipping 139 matching lines @@
         CommandLine v8_command_line(
             parsed_command_line.GetSwitchValuePath(switches::kJavaScriptFlags));
         if (v8_command_line.HasSwitch(kV8LogFileSwitch)) {
           g_v8_log_path = base::MakeAbsoluteFilePath(
               v8_command_line.GetSwitchValuePath(kV8LogFileSwitch));
         }
       }
     }
   }
 }