Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/prefs/pref_service_mock_builder.cc

Index: chrome/browser/prefs/pref_service_mock_builder.cc
diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc
index ce7f4477aeb4d536e2b78db5b49d22ca113b3681..314fa8f02e22667ca69e63c58371ccc948409a28 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.cc
+++ b/chrome/browser/prefs/pref_service_mock_builder.cc
@@ -15,44 +15,22 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "content/public/browser/browser_thread.h"

[Mattias Nissler (ping if slow), 2012/12/21 15:03:20]

Please clean up the #includes that are no longer needed.

[Jói, 2012/12/21 15:29:52]

Done.

-#include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 PrefServiceMockBuilder::PrefServiceMockBuilder() {
-  ResetTestingState();
 }
 
 PrefServiceMockBuilder::~PrefServiceMockBuilder() {}
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
-PrefServiceMockBuilder& PrefServiceMockBuilder::WithManagedPolicies(
-    policy::PolicyService* service) {
-  WithManagedPrefs(new policy::ConfigurationPolicyPrefStore(
-      service, policy::POLICY_LEVEL_MANDATORY));
-  return *this;
-}
-
-PrefServiceMockBuilder& PrefServiceMockBuilder::WithRecommendedPolicies(
-    policy::PolicyService* service) {
-  WithRecommendedPrefs(new policy::ConfigurationPolicyPrefStore(
-      service, policy::POLICY_LEVEL_RECOMMENDED));
-  return *this;
-}
-#endif
-
-PrefServiceMockBuilder&
-PrefServiceMockBuilder::WithCommandLine(CommandLine* command_line) {
-  WithCommandLinePrefs(new CommandLinePrefStore(command_line));
-  return *this;
-}
-
-PrefService* PrefServiceMockBuilder::Create() {
-  PrefService* pref_service = PrefServiceBuilder::Create();
-  ResetTestingState();
-  return pref_service;
+PrefServiceSimple* PrefServiceMockBuilder::CreateSimple() {
+  user_prefs_ = new TestingPrefStore;

[Mattias Nissler (ping if slow), 2012/12/21 15:03:20]

I think you should do this in a ResetDefaultState() override, so the builder
does behave correctly when WithUserPrefs() is called and on repeated CreateXYZ()
invocations.

[Jói, 2012/12/21 15:29:52]

Good idea, switched to that approach.

+  PrefServiceSimple* service = PrefServiceBuilder::CreateSimple();
+  return service;
 }
 
-void PrefServiceMockBuilder::ResetTestingState() {
+PrefServiceSyncable* PrefServiceMockBuilder::CreateSyncable() {
   user_prefs_ = new TestingPrefStore;
+  PrefServiceSyncable* service = PrefServiceSyncableBuilder::CreateSyncable();
+  return service;
 }