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

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

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « base/prefs/scoped_user_pref_update_unittest.cc ('k') | base/process/memory_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/googletest/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( 22 : PrefService(
23 pref_notifier, 23 pref_notifier,
(...skipping 21 matching lines...) Expand all
45 new TestingPrefStore(), 45 new TestingPrefStore(),
46 new PrefRegistrySimple(), 46 new PrefRegistrySimple(),
47 new PrefNotifierImpl()) {} 47 new PrefNotifierImpl()) {}
48 48
49 TestingPrefServiceSimple::~TestingPrefServiceSimple() { 49 TestingPrefServiceSimple::~TestingPrefServiceSimple() {
50 } 50 }
51 51
52 PrefRegistrySimple* TestingPrefServiceSimple::registry() { 52 PrefRegistrySimple* TestingPrefServiceSimple::registry() {
53 return static_cast<PrefRegistrySimple*>(DeprecatedGetPrefRegistry()); 53 return static_cast<PrefRegistrySimple*>(DeprecatedGetPrefRegistry());
54 } 54 }
OLDNEW
« no previous file with comments | « base/prefs/scoped_user_pref_update_unittest.cc ('k') | base/process/memory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698