Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/prefs/pref_service_mock_builder.h

Index: chrome/browser/prefs/pref_service_mock_builder.h
diff --git a/chrome/browser/prefs/pref_service_mock_builder.h b/chrome/browser/prefs/pref_service_mock_builder.h
index 8b8aeabb0160513ab06d589e8d9b63d97d0b6758..8aef41ec3ba814eb1f759634361ebcf1b42799f2 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.h
+++ b/chrome/browser/prefs/pref_service_mock_builder.h
@@ -5,48 +5,23 @@
 #ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_MOCK_BUILDER_H_
 #define CHROME_BROWSER_PREFS_PREF_SERVICE_MOCK_BUILDER_H_
 
-#include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
-#include "base/prefs/persistent_pref_store.h"
-#include "base/prefs/pref_store.h"
-#include "chrome/browser/prefs/pref_service_builder.h"
+#include "chrome/browser/prefs/pref_service_syncable_builder.h"
 
-class CommandLine;
-class FilePath;
-class PrefService;
-
-namespace base {
-class SequencedTaskRunner;
-}
-
-namespace policy {
-class PolicyService;
-}
+class PrefServiceSimple;
+class PrefServiceSyncable;
 
 // A helper that allows convenient building of custom PrefServices in tests.
-class PrefServiceMockBuilder : public PrefServiceBuilder {
+class PrefServiceMockBuilder : public PrefServiceSyncableBuilder {
  public:
   PrefServiceMockBuilder();
   virtual ~PrefServiceMockBuilder();
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
-  // Set up policy pref stores using the given policy service.
-  PrefServiceMockBuilder& WithManagedPolicies(
-      policy::PolicyService* service);
-  PrefServiceMockBuilder& WithRecommendedPolicies(
-      policy::PolicyService* service);
-#endif
-
-  // Specifies to use an actual command-line backed command-line pref store.
-  PrefServiceMockBuilder& WithCommandLine(CommandLine* command_line);
-
   // Creates a PrefService for testing, invalidating the entire
   // builder configuration.
-  virtual PrefService* Create() OVERRIDE;
+  virtual PrefServiceSimple* CreateSimple() OVERRIDE;
+  virtual PrefServiceSyncable* CreateSyncable() OVERRIDE;
 
  private:
-  void ResetTestingState();
-
   DISALLOW_COPY_AND_ASSIGN(PrefServiceMockBuilder);
 };