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

Side by Side Diff: base/prefs/testing_pref_service.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/prefs/testing_pref_service.h ('k') | base/task_runner_util_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/prefs/testing_pref_service.h" 5 #include "base/prefs/testing_pref_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/prefs/default_pref_store.h" 9 #include "base/prefs/default_pref_store.h"
10 #include "base/prefs/pref_notifier_impl.h" 10 #include "base/prefs/pref_notifier_impl.h"
11 #include "base/prefs/pref_registry_simple.h" 11 #include "base/prefs/pref_registry_simple.h"
12 #include "base/prefs/pref_value_store.h" 12 #include "base/prefs/pref_value_store.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 template<> 15 template <>
16 TestingPrefServiceBase<PrefService, PrefRegistry>::TestingPrefServiceBase( 16 TestingPrefServiceBase<PrefService, PrefRegistry>::TestingPrefServiceBase(
17 TestingPrefStore* managed_prefs, 17 TestingPrefStore* managed_prefs,
18 TestingPrefStore* user_prefs, 18 TestingPrefStore* user_prefs,
19 TestingPrefStore* recommended_prefs, 19 TestingPrefStore* recommended_prefs,
20 PrefRegistry* pref_registry, 20 PrefRegistry* pref_registry,
21 PrefNotifierImpl* pref_notifier) 21 PrefNotifierImpl* pref_notifier)
22 : PrefService(pref_notifier, 22 : PrefService(
23 new PrefValueStore( 23 pref_notifier,
24 managed_prefs, 24 new PrefValueStore(managed_prefs,
25 NULL, 25 NULL,
26 NULL, 26 NULL,
27 user_prefs, 27 user_prefs,
28 recommended_prefs, 28 recommended_prefs,
29 pref_registry->defaults(), 29 pref_registry->defaults().get(),
30 pref_notifier), 30 pref_notifier),
31 user_prefs, 31 user_prefs,
32 pref_registry, 32 pref_registry,
33 base::Bind( 33 base::Bind(&TestingPrefServiceBase<PrefService,
34 &TestingPrefServiceBase< 34 PrefRegistry>::HandleReadError),
35 PrefService, PrefRegistry>::HandleReadError), 35 false),
36 false),
37 managed_prefs_(managed_prefs), 36 managed_prefs_(managed_prefs),
38 user_prefs_(user_prefs), 37 user_prefs_(user_prefs),
39 recommended_prefs_(recommended_prefs) { 38 recommended_prefs_(recommended_prefs) {}
40 }
41 39
42 TestingPrefServiceSimple::TestingPrefServiceSimple() 40 TestingPrefServiceSimple::TestingPrefServiceSimple()
43 : TestingPrefServiceBase<PrefService, PrefRegistry>( 41 : TestingPrefServiceBase<PrefService, PrefRegistry>(
44 new TestingPrefStore(), 42 new TestingPrefStore(),
45 new TestingPrefStore(), 43 new TestingPrefStore(),
46 new TestingPrefStore(), 44 new TestingPrefStore(),
47 new PrefRegistrySimple(), 45 new PrefRegistrySimple(),
48 new PrefNotifierImpl()) { 46 new PrefNotifierImpl()) {
49 } 47 }
50 48
51 TestingPrefServiceSimple::~TestingPrefServiceSimple() { 49 TestingPrefServiceSimple::~TestingPrefServiceSimple() {
52 } 50 }
53 51
54 PrefRegistrySimple* TestingPrefServiceSimple::registry() { 52 PrefRegistrySimple* TestingPrefServiceSimple::registry() {
55 return static_cast<PrefRegistrySimple*>(DeprecatedGetPrefRegistry()); 53 return static_cast<PrefRegistrySimple*>(DeprecatedGetPrefRegistry());
56 } 54 }
OLDNEW
« no previous file with comments | « base/prefs/testing_pref_service.h ('k') | base/task_runner_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698