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

Unified Diff: chrome/browser/ui/webui/options/preferences_browsertest.h

Issue 11362250: Remove PrefObserver usages, batch 6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/ui/webui/options/preferences_browsertest.h
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.h b/chrome/browser/ui/webui/options/preferences_browsertest.h
index 25d14b09c5276ca87416f55639d91a482aab4a33..b26ac6203c856d1440286928f3978d57fdda8d22 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.h
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.h
@@ -11,7 +11,6 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/prefs/public/pref_change_registrar.h"
-#include "base/prefs/public/pref_observer.h"
#include "chrome/browser/policy/mock_configuration_policy_provider.h"
#include "chrome/browser/policy/policy_types.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -33,8 +32,7 @@ class RenderViewHost;
// Tests verifying that the JavaScript Preferences class, the underlying C++
// CoreOptionsHandler and the specialized classes handling Chrome OS device and
// proxy prefs behave correctly.
-class PreferencesBrowserTest : public InProcessBrowserTest,
- public PrefObserver {
+class PreferencesBrowserTest : public InProcessBrowserTest {
public:
PreferencesBrowserTest();
~PreferencesBrowserTest();
@@ -42,9 +40,7 @@ class PreferencesBrowserTest : public InProcessBrowserTest,
// InProcessBrowserTest implementation:
virtual void SetUpOnMainThread() OVERRIDE;
- // PrefObserver implementation:
- virtual void OnPreferenceChanged(PrefServiceBase* service,
- const std::string& pref_name) OVERRIDE;
+ void OnPreferenceChanged(const std::string& pref_name);
protected:
MOCK_METHOD1(OnCommit, void(const PrefService::Preference*));

Powered by Google App Engine
This is Rietveld 408576698