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

Unified Diff: chrome/browser/prefs/pref_observer_mock.h

Issue 6056008: Move lots of GMock stuff out of line. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright junk Created 9 years, 12 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prefs/pref_observer_mock.h
diff --git a/chrome/browser/prefs/pref_observer_mock.h b/chrome/browser/prefs/pref_observer_mock.h
index f339841d3edfaaad777d470ebb33969d177a5e03..0c651caaa4e6a532792bfaf4d94a3c0171534140 100644
--- a/chrome/browser/prefs/pref_observer_mock.h
+++ b/chrome/browser/prefs/pref_observer_mock.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -39,8 +39,8 @@ MATCHER_P3(PrefValueMatches, prefs, pref_name, value, "") {
// A mock for testing preference notifications and easy setup of expectations.
class PrefObserverMock : public NotificationObserver {
public:
- PrefObserverMock() {}
- virtual ~PrefObserverMock() {}
+ PrefObserverMock();
+ virtual ~PrefObserverMock();
MOCK_METHOD3(Observe, void(NotificationType type,
const NotificationSource& source,
@@ -48,13 +48,7 @@ class PrefObserverMock : public NotificationObserver {
void Expect(const PrefService* prefs,
const std::string& pref_name,
- const Value* value) {
- EXPECT_CALL(*this, Observe(NotificationType(NotificationType::PREF_CHANGED),
- Source<PrefService>(prefs),
- Property(&Details<std::string>::ptr,
- Pointee(pref_name))))
- .With(PrefValueMatches(prefs, pref_name, value));
- }
+ const Value* value);
};
#endif // CHROME_BROWSER_PREFS_PREF_OBSERVER_MOCK_H_

Powered by Google App Engine
This is Rietveld 408576698