Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm

 // 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.
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "third_party/ocmock/gtest_support.h"
 #import "third_party/ocmock/ocmock/OCMock.h"
 
 // A BrowserWindowCocoa that goes PONG when
 // BOOKMARK_BAR_VISIBILITY_PREF_CHANGED is sent.  This is so we can be
 // sure we are observing it.
-class BrowserWindowCocoaPong : public BrowserWindowCocoa {
+class BrowserWindowCocoaPong : public BrowserWindowCocoa, public PrefObserver {
  public:
   BrowserWindowCocoaPong(Browser* browser,
                          BrowserWindowController* controller)
       : BrowserWindowCocoa(browser, controller) {
     pong_ = false;
   }
   virtual ~BrowserWindowCocoaPong() { }
 
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) {
-    if (type == chrome::NOTIFICATION_PREF_CHANGED) {
-      const std::string& pref_name =
-          *content::Details<std::string>(details).ptr();
-      if (pref_name == prefs::kShowBookmarkBar)
-        pong_ = true;
-    }
-    BrowserWindowCocoa::Observe(type, source, details);
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE {
+    if (pref_name == prefs::kShowBookmarkBar)
+      pong_ = true;
   }
 
+

[Mattias Nissler (ping if slow), 2012/10/31 13:29:36]

remove extra newline.

[Jói, 2012/10/31 14:56:26]

Done.

   bool pong_;
 };
 
 // Main test class.
 class BrowserWindowCocoaTest : public CocoaProfileTest {
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
     controller_ = [[BrowserWindowController alloc] initWithBrowser:browser()
@@ skipping 189 matching lines @@
   [[[window_ stub] andReturn:nil] delegate];
   [[[controller_ stub] andReturn:window_] window];
   [[window_ expect] orderOut:nil];
   [[window_ expect] close];
   CreateAndCloseBrowserWindow();
   EXPECT_OCMOCK_VERIFY(controller_);
   EXPECT_OCMOCK_VERIFY(window_);
 }
 
 // TODO(???): test other methods of BrowserWindowCocoa