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

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

Issue 289373006: Revert 271416 "Store a stacktrace of PrefService destruction in ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/base/prefs/pref_notifier_impl.cc ('k') | trunk/src/base/prefs/pref_observer.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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 using PrefNotifierImpl::OnPreferenceChanged; 73 using PrefNotifierImpl::OnPreferenceChanged;
74 using PrefNotifierImpl::OnInitializationCompleted; 74 using PrefNotifierImpl::OnInitializationCompleted;
75 }; 75 };
76 76
77 class PrefObserverMock : public PrefObserver { 77 class PrefObserverMock : public PrefObserver {
78 public: 78 public:
79 PrefObserverMock() {} 79 PrefObserverMock() {}
80 virtual ~PrefObserverMock() {} 80 virtual ~PrefObserverMock() {}
81 81
82 MOCK_METHOD2(OnPreferenceChanged, void(PrefService*, const std::string&)); 82 MOCK_METHOD2(OnPreferenceChanged, void(PrefService*, const std::string&));
83
84 // TODO(battre) Remove function. See crbug.com/373435.
85 MOCK_METHOD1(SetPrefServiceDestructionTrace, void(const std::string&));
86 }; 83 };
87 84
88 // Test fixture class. 85 // Test fixture class.
89 class PrefNotifierTest : public testing::Test { 86 class PrefNotifierTest : public testing::Test {
90 protected: 87 protected:
91 virtual void SetUp() { 88 virtual void SetUp() {
92 pref_service_.registry()->RegisterBooleanPref(kChangedPref, true); 89 pref_service_.registry()->RegisterBooleanPref(kChangedPref, true);
93 pref_service_.registry()->RegisterBooleanPref(kUnchangedPref, true); 90 pref_service_.registry()->RegisterBooleanPref(kUnchangedPref, true);
94 } 91 }
95 92
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 EXPECT_CALL(obs2_, OnPreferenceChanged(&pref_service_, kChangedPref)); 211 EXPECT_CALL(obs2_, OnPreferenceChanged(&pref_service_, kChangedPref));
215 notifier.OnPreferenceChanged(kChangedPref); 212 notifier.OnPreferenceChanged(kChangedPref);
216 Mock::VerifyAndClearExpectations(&obs1_); 213 Mock::VerifyAndClearExpectations(&obs1_);
217 Mock::VerifyAndClearExpectations(&obs2_); 214 Mock::VerifyAndClearExpectations(&obs2_);
218 215
219 notifier.RemovePrefObserver(kChangedPref, &obs2_); 216 notifier.RemovePrefObserver(kChangedPref, &obs2_);
220 notifier.RemovePrefObserver(kUnchangedPref, &obs2_); 217 notifier.RemovePrefObserver(kUnchangedPref, &obs2_);
221 } 218 }
222 219
223 } // namespace 220 } // namespace
OLDNEW
« no previous file with comments | « trunk/src/base/prefs/pref_notifier_impl.cc ('k') | trunk/src/base/prefs/pref_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698