Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: chrome/test/base/testing_pref_service.cc

Issue 12253004: Moving last generic Prefs implementation files to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge LKGR Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/testing_pref_service.h ('k') | chrome/test/base/testing_pref_service_syncable.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_pref_service.cc
diff --git a/chrome/test/base/testing_pref_service.cc b/chrome/test/base/testing_pref_service.cc
deleted file mode 100644
index ae7342e988cfccc837b89635efd4ae4b03e150f6..0000000000000000000000000000000000000000
--- a/chrome/test/base/testing_pref_service.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// 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.
-
-#include "chrome/test/base/testing_pref_service.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 "testing/gtest/include/gtest/gtest.h"
-
-template<>
-TestingPrefServiceBase<PrefService, PrefRegistry>::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(
- &TestingPrefServiceBase<
- PrefService, PrefRegistry>::HandleReadError),
- false),
- managed_prefs_(managed_prefs),
- user_prefs_(user_prefs),
- recommended_prefs_(recommended_prefs) {
-}
-
-TestingPrefServiceSimple::TestingPrefServiceSimple()
- : TestingPrefServiceBase<PrefService, PrefRegistry>(
- new TestingPrefStore(),
- new TestingPrefStore(),
- new TestingPrefStore(),
- new PrefRegistrySimple(),
- new PrefNotifierImpl()) {
-}
-
-TestingPrefServiceSimple::~TestingPrefServiceSimple() {
-}
-
-PrefRegistrySimple* TestingPrefServiceSimple::registry() {
- return static_cast<PrefRegistrySimple*>(DeprecatedGetPrefRegistry());
-}
« no previous file with comments | « chrome/test/base/testing_pref_service.h ('k') | chrome/test/base/testing_pref_service_syncable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698