Not for check-in. Manually reviewable parts of https://codereview.chromium.org/11570009/

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 4f2d7b42b8210b3808ad2b3b922374d743ced17b..4c82e4f6ea4941d85dc785678f1521c3c6e6b70e 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.h
+++ b/chrome/browser/prefs/pref_service_mock_builder.h
@@ -13,7 +13,8 @@
 
 class CommandLine;
 class FilePath;
-class PrefService;
+class PrefServiceSimple;
+class PrefServiceSyncable;
 
 namespace base {
 class SequencedTaskRunner;
@@ -27,7 +28,7 @@ class PolicyService;
 class PrefServiceMockBuilder : public PrefServiceBuilder {
  public:
   PrefServiceMockBuilder();
-  ~PrefServiceMockBuilder();
+  virtual ~PrefServiceMockBuilder();
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // Set up policy pref stores using the given policy service.
@@ -42,7 +43,8 @@ class PrefServiceMockBuilder : public PrefServiceBuilder {
 
   // Creates a PrefService for testing, invalidating the entire
   // builder configuration.
-  virtual PrefService* Create() OVERRIDE;
+  PrefServiceSimple* CreateSimple();
+  PrefServiceSyncable* CreateSyncable();
 
  private:
   void ResetTestingState();