Split testing_pref_service.h/.cc into two parts, generic vs. Chrome-specific.

chrome/test/base/testing_pref_service_syncable.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 "chrome/test/base/testing_pref_service.h"
+#include "chrome/test/base/testing_pref_service_syncable.h"
 
 #include "base/bind.h"
-#include "base/compiler_specific.h"
-#include "base/prefs/default_pref_store.h"
 #include "base/prefs/pref_notifier_impl.h"
-#include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_value_store.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-
-// Do-nothing implementation for TestingPrefService.
-void HandleReadError(PersistentPrefStore::PrefReadError error) {
-}
-
-}  // namespace
-
-template<>
-TestingPrefServiceBase<PrefService>::TestingPrefServiceBase(
-    TestingPrefStore* managed_prefs,
-    TestingPrefStore* user_prefs,
-    TestingPrefStore* recommended_prefs,
-    PrefRegistry* pref_registry,
-    PrefNotifierImpl* pref_notifier)
-    : PrefService(pref_notifier,
-                  new PrefValueStore(
-                      managed_prefs,
-                      NULL,
-                      NULL,
-                      user_prefs,
-                      recommended_prefs,
-                      pref_registry->defaults(),
-                      pref_notifier),
-                  user_prefs,
-                  pref_registry,
-                  base::Bind(&HandleReadError),
-                  false),
-      managed_prefs_(managed_prefs),
-      user_prefs_(user_prefs),
-      recommended_prefs_(recommended_prefs) {
-}
-
 template<>
 TestingPrefServiceBase<PrefServiceSyncable>::TestingPrefServiceBase(
     TestingPrefStore* managed_prefs,
     TestingPrefStore* user_prefs,
     TestingPrefStore* recommended_prefs,
     PrefRegistry* pref_registry,
     PrefNotifierImpl* pref_notifier)
     : PrefServiceSyncable(pref_notifier,
                           new PrefValueStore(
                               managed_prefs,
                               NULL,
                               NULL,
                               user_prefs,
                               recommended_prefs,
                               pref_registry->defaults(),
                               pref_notifier),
                           user_prefs,
                           static_cast<PrefRegistrySyncable*>(pref_registry),

[Mattias Nissler (ping if slow), 2013/02/12 13:53:32]

Hm, so this hack is here to stay? I guess the only real chance to clean this up
is getting rid of PrefServiceSyncable?

[Jói, 2013/02/12 14:35:51]

Which hack do you mean, the cast to PrefRegistrySyncable? That's just to be able
to reuse TestingPrefServiceBase while at the same time PrefServiceSyncable
requires a PrefRegistrySyncable rather than the generic PrefRegistry type.

I don't think it's possible to get rid of the cast, it needs to be either here
or in the PrefServiceSyncable constructor, and moving it to the constructor
would mean less type safety.

[Mattias Nissler (ping if slow), 2013/02/12 14:42:57]

Yes, I mean the cast. Thinking more about it, there is one option: Add the
registry as a template parameter. WDYT?

-                          base::Bind(&HandleReadError),
+                          base::Bind(&TestingPrefServiceBase<
+                                         PrefServiceSyncable>::HandleReadError),
                           false),
       managed_prefs_(managed_prefs),
       user_prefs_(user_prefs),
       recommended_prefs_(recommended_prefs) {
 }
 
-TestingPrefServiceSimple::TestingPrefServiceSimple()
-    : TestingPrefServiceBase<PrefService>(
-        new TestingPrefStore(),
-        new TestingPrefStore(),
-        new TestingPrefStore(),
-        new PrefRegistrySimple(),
-        new PrefNotifierImpl()) {
-}
-
-TestingPrefServiceSimple::~TestingPrefServiceSimple() {
-}
-
-PrefRegistrySimple* TestingPrefServiceSimple::registry() {
-  return static_cast<PrefRegistrySimple*>(DeprecatedGetPrefRegistry());
-}
-
 TestingPrefServiceSyncable::TestingPrefServiceSyncable()
     : TestingPrefServiceBase<PrefServiceSyncable>(
         new TestingPrefStore(),
         new TestingPrefStore(),
         new TestingPrefStore(),
         new PrefRegistrySyncable(),
         new PrefNotifierImpl()) {
 }
 
 TestingPrefServiceSyncable::~TestingPrefServiceSyncable() {
 }
 
 PrefRegistrySyncable* TestingPrefServiceSyncable::registry() {
   return static_cast<PrefRegistrySyncable*>(DeprecatedGetPrefRegistry());
 }
 
 ScopedTestingLocalState::ScopedTestingLocalState(
     TestingBrowserProcess* browser_process)
     : browser_process_(browser_process) {
   chrome::RegisterLocalState(&local_state_,
                              local_state_.registry());

[Mattias Nissler (ping if slow), 2013/02/12 13:53:32]

nit: fits previous line.

[Jói, 2013/02/12 14:35:51]

Done.

   EXPECT_FALSE(browser_process->local_state());
   browser_process->SetLocalState(&local_state_);
 }
 
 ScopedTestingLocalState::~ScopedTestingLocalState() {
   EXPECT_EQ(&local_state_, browser_process_->local_state());
   browser_process_->SetLocalState(NULL);
 }