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

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

Issue 753603002: Change preference APIs to take std::string instead of const char*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed all calls to c_str() in prefs. Created 6 years 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/pref_notifier_impl.cc ('k') | base/prefs/pref_registry.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/prefs/mock_pref_change_callback.h" 7 #include "base/prefs/mock_pref_change_callback.h"
8 #include "base/prefs/pref_notifier_impl.h" 8 #include "base/prefs/pref_notifier_impl.h"
9 #include "base/prefs/pref_observer.h" 9 #include "base/prefs/pref_observer.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 // Mock PrefNotifier that allows tracking of observers and notifications. 45 // Mock PrefNotifier that allows tracking of observers and notifications.
46 class MockPrefNotifier : public PrefNotifierImpl { 46 class MockPrefNotifier : public PrefNotifierImpl {
47 public: 47 public:
48 explicit MockPrefNotifier(PrefService* pref_service) 48 explicit MockPrefNotifier(PrefService* pref_service)
49 : PrefNotifierImpl(pref_service) {} 49 : PrefNotifierImpl(pref_service) {}
50 virtual ~MockPrefNotifier() {} 50 virtual ~MockPrefNotifier() {}
51 51
52 MOCK_METHOD1(FireObservers, void(const std::string& path)); 52 MOCK_METHOD1(FireObservers, void(const std::string& path));
53 53
54 size_t CountObserver(const char* path, PrefObserver* obs) { 54 size_t CountObserver(const std::string& path, PrefObserver* obs) {
55 PrefObserverMap::const_iterator observer_iterator = 55 PrefObserverMap::const_iterator observer_iterator =
56 pref_observers()->find(path); 56 pref_observers()->find(path);
57 if (observer_iterator == pref_observers()->end()) 57 if (observer_iterator == pref_observers()->end())
58 return false; 58 return false;
59 59
60 PrefObserverList* observer_list = observer_iterator->second; 60 PrefObserverList* observer_list = observer_iterator->second;
61 PrefObserverList::Iterator it(*observer_list); 61 PrefObserverList::Iterator it(*observer_list);
62 PrefObserver* existing_obs; 62 PrefObserver* existing_obs;
63 size_t count = 0; 63 size_t count = 0;
64 while ((existing_obs = it.GetNext()) != NULL) { 64 while ((existing_obs = it.GetNext()) != NULL) {
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 EXPECT_CALL(obs2_, OnPreferenceChanged(&pref_service_, kChangedPref)); 211 EXPECT_CALL(obs2_, OnPreferenceChanged(&pref_service_, kChangedPref));
212 notifier.OnPreferenceChanged(kChangedPref); 212 notifier.OnPreferenceChanged(kChangedPref);
213 Mock::VerifyAndClearExpectations(&obs1_); 213 Mock::VerifyAndClearExpectations(&obs1_);
214 Mock::VerifyAndClearExpectations(&obs2_); 214 Mock::VerifyAndClearExpectations(&obs2_);
215 215
216 notifier.RemovePrefObserver(kChangedPref, &obs2_); 216 notifier.RemovePrefObserver(kChangedPref, &obs2_);
217 notifier.RemovePrefObserver(kUnchangedPref, &obs2_); 217 notifier.RemovePrefObserver(kUnchangedPref, &obs2_);
218 } 218 }
219 219
220 } // namespace 220 } // namespace
OLDNEW
« no previous file with comments | « base/prefs/pref_notifier_impl.cc ('k') | base/prefs/pref_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698