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

Side by Side Diff: chrome/browser/prefs/pref_notifier_impl_unittest.cc

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 4 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
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 "chrome/browser/prefs/pref_notifier_impl.h" 5 #include "chrome/browser/prefs/pref_notifier_impl.h"
6 #include "chrome/browser/prefs/pref_observer_mock.h" 6 #include "chrome/browser/prefs/pref_observer_mock.h"
7 #include "chrome/browser/prefs/pref_service.h" 7 #include "chrome/browser/prefs/pref_service.h"
8 #include "chrome/browser/prefs/pref_value_store.h" 8 #include "chrome/browser/prefs/pref_value_store.h"
9 #include "chrome/common/chrome_notification_types.h" 9 #include "chrome/common/chrome_notification_types.h"
10 #include "chrome/test/base/testing_browser_process_test.h"
11 #include "chrome/test/base/testing_pref_service.h" 10 #include "chrome/test/base/testing_pref_service.h"
12 #include "content/common/notification_observer_mock.h" 11 #include "content/common/notification_observer_mock.h"
13 #include "content/common/notification_registrar.h" 12 #include "content/common/notification_registrar.h"
14 #include "content/common/notification_service.h" 13 #include "content/common/notification_service.h"
15 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
16 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
17 16
18 using testing::_; 17 using testing::_;
19 using testing::Field; 18 using testing::Field;
20 using testing::Invoke; 19 using testing::Invoke;
(...skipping 27 matching lines...) Expand all
48 while ((existing_obs = it.GetNext()) != NULL) { 47 while ((existing_obs = it.GetNext()) != NULL) {
49 if (existing_obs == obs) 48 if (existing_obs == obs)
50 count++; 49 count++;
51 } 50 }
52 51
53 return count; 52 return count;
54 } 53 }
55 }; 54 };
56 55
57 // Test fixture class. 56 // Test fixture class.
58 class PrefNotifierTest : public TestingBrowserProcessTest { 57 class PrefNotifierTest : public testing::Test {
59 protected: 58 protected:
60 virtual void SetUp() { 59 virtual void SetUp() {
61 pref_service_.RegisterBooleanPref(kChangedPref, 60 pref_service_.RegisterBooleanPref(kChangedPref,
62 true, 61 true,
63 PrefService::UNSYNCABLE_PREF); 62 PrefService::UNSYNCABLE_PREF);
64 pref_service_.RegisterBooleanPref(kUnchangedPref, 63 pref_service_.RegisterBooleanPref(kUnchangedPref,
65 true, 64 true,
66 PrefService::UNSYNCABLE_PREF); 65 PrefService::UNSYNCABLE_PREF);
67 } 66 }
68 67
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 obs2_.Expect(&pref_service_, kChangedPref, &value_true); 190 obs2_.Expect(&pref_service_, kChangedPref, &value_true);
192 notifier.OnPreferenceChanged(kChangedPref); 191 notifier.OnPreferenceChanged(kChangedPref);
193 Mock::VerifyAndClearExpectations(&obs1_); 192 Mock::VerifyAndClearExpectations(&obs1_);
194 Mock::VerifyAndClearExpectations(&obs2_); 193 Mock::VerifyAndClearExpectations(&obs2_);
195 194
196 notifier.RemovePrefObserver(kChangedPref, &obs2_); 195 notifier.RemovePrefObserver(kChangedPref, &obs2_);
197 notifier.RemovePrefObserver(kUnchangedPref, &obs2_); 196 notifier.RemovePrefObserver(kUnchangedPref, &obs2_);
198 } 197 }
199 198
200 } // namespace 199 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698