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

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

Issue 11316163: Remove the last usages of PrefObserver outside of Prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments. Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/pref_notifier_impl_unittest.cc ('k') | chrome/browser/prefs/pref_observer_mock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
deleted file mode 100644
index be7f4ff455b54e0371e0f68c999de048d5f3cabb..0000000000000000000000000000000000000000
--- a/chrome/browser/prefs/pref_observer_mock.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_PREFS_PREF_OBSERVER_MOCK_H_
-#define CHROME_BROWSER_PREFS_PREF_OBSERVER_MOCK_H_
-
-#include <string>
-
-#include "base/prefs/public/pref_observer.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-using testing::Pointee;
-using testing::Property;
-using testing::Truly;
-
-// Matcher that checks whether the current value of the preference named
-// |pref_name| in |prefs| matches |value|. If |value| is NULL, the matcher
-// checks that the value is not set.
-MATCHER_P3(PrefValueMatches, prefs, pref_name, value, "") {
- const PrefServiceBase::Preference* pref =
- prefs->FindPreference(pref_name.c_str());
- if (!pref)
- return false;
-
- const Value* actual_value = pref->GetValue();
- if (!actual_value)
- return value == NULL;
- if (!value)
- return actual_value == NULL;
- return value->Equals(actual_value);
-}
-
-// A mock for testing preference notifications and easy setup of expectations.
-class PrefObserverMock : public PrefObserver {
- public:
- PrefObserverMock();
- virtual ~PrefObserverMock();
-
- MOCK_METHOD2(OnPreferenceChanged, void(PrefServiceBase*, const std::string&));
-
- void Expect(PrefServiceBase* prefs,
- const std::string& pref_name,
- const Value* value);
-};
-
-#endif // CHROME_BROWSER_PREFS_PREF_OBSERVER_MOCK_H_
« no previous file with comments | « chrome/browser/prefs/pref_notifier_impl_unittest.cc ('k') | chrome/browser/prefs/pref_observer_mock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698