Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/content_settings/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/overlay_user_pref_store.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/threading/platform_thread.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
-#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/browser/notification_observer.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using content::BrowserThread;
 
 namespace content_settings {
 
 class DeadlockCheckerThread : public base::PlatformThread::Delegate {
  public:
   explicit DeadlockCheckerThread(PrefProvider* provider)
       : provider_(provider) {}
 
   virtual void ThreadMain() {
     bool got_lock = provider_->lock_.Try();
     EXPECT_TRUE(got_lock);
     if (got_lock)
       provider_->lock_.Release();
   }
  private:
   PrefProvider* provider_;
   DISALLOW_COPY_AND_ASSIGN(DeadlockCheckerThread);
 };
 
 // A helper for observing an preference changes and testing whether
 // |PrefProvider| holds a lock when the preferences change.
-class DeadlockCheckerObserver : public content::NotificationObserver {
+class DeadlockCheckerObserver : public PrefObserver {
  public:
   // |DeadlockCheckerObserver| doesn't take the ownership of |prefs| or
   // ||provider|.
   DeadlockCheckerObserver(PrefService* prefs, PrefProvider* provider)
       : provider_(provider),
       notification_received_(false) {
     pref_change_registrar_.Init(prefs);
     pref_change_registrar_.Add(prefs::kContentSettingsPatternPairs, this);
   }
   virtual ~DeadlockCheckerObserver() {}
 
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) {
-    ASSERT_EQ(type, chrome::NOTIFICATION_PREF_CHANGED);
-    // Check whether |provider_| holds its lock. For this, we need a separate
-    // thread.
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) {
+    // Check whether |provider_| holds its lock. For this, we need a
+    // separate thread.
     DeadlockCheckerThread thread(provider_);
     base::PlatformThreadHandle handle = base::kNullThreadHandle;
     ASSERT_TRUE(base::PlatformThread::Create(0, &thread, &handle));
     base::PlatformThread::Join(handle);
     notification_received_ = true;
   }
 
   bool notification_received() const {
     return notification_received_;
   }
@@ skipping 486 matching lines @@
     DictionaryValue* mutable_settings = update.Get();
     mutable_settings->SetWithoutPathExpansion("www.example.com,*",
                                               new base::DictionaryValue());
   }
   EXPECT_TRUE(observer.notification_received());
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings