content: convert zoom notifications to observer usage

chrome/browser/profiles/off_the_record_profile_impl_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/profiles/off_the_record_profile_impl.h"
 
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/host_zoom_map.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 
 using content::HostZoomMap;
+using content::HostZoomMapObserver;
 
 namespace {
 
-class TestingProfileWithHostZoomMap : public TestingProfile,
-                                      public content::NotificationObserver {
+class TestingProfileWithHostZoomMap : public TestingProfile {
  public:
   TestingProfileWithHostZoomMap() {
-    HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
-    registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
-                   content::Source<HostZoomMap>(host_zoom_map));
+    HostZoomMap::GetForBrowserContext(this)->AddZoomLevelChangedCallback(
+        base::Bind(&TestingProfileWithHostZoomMap::OnZoomLevelChanged, this));
   }
 
-  virtual ~TestingProfileWithHostZoomMap() {}
+  virtual ~TestingProfileWithHostZoomMap() {
+    HostZoomMap::GetForBrowserContext(this)->RemoveZoomLevelChangedCallback(
+        base::Bind(&TestingProfileWithHostZoomMap::OnZoomLevelChanged, this));
+  }
 
   virtual Profile* GetOffTheRecordProfile() OVERRIDE {
     if (!off_the_record_profile_.get())
       off_the_record_profile_.reset(CreateOffTheRecordProfile());
     return off_the_record_profile_.get();
   }
 
   virtual PrefServiceSyncable* GetOffTheRecordPrefs() OVERRIDE {
     return GetPrefs();
   }
 
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
-    const std::string& host =
-        *(content::Details<const std::string>(details).ptr());
-    DCHECK(type == content::NOTIFICATION_ZOOM_LEVEL_CHANGED);
+  void OnZoomLevelChanged(const std::string& host) {
     if (host.empty())
       return;
 
     HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
     double level = host_zoom_map->GetZoomLevel(host);
     DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels);
     DictionaryValue* host_zoom_dictionary = update.Get();
     if (level == host_zoom_map->GetDefaultZoomLevel()) {
       host_zoom_dictionary->RemoveWithoutPathExpansion(host, NULL);
     } else {
       host_zoom_dictionary->SetWithoutPathExpansion(
           host, Value::CreateDoubleValue(level));
     }
   }
 
  private:
-  content::NotificationRegistrar registrar_;
   scoped_ptr<Profile> off_the_record_profile_;
   scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingProfileWithHostZoomMap);
 };
 
 }  // namespace
 
 // We need to have a BrowserProcess in g_browser_process variable, since
 // OffTheRecordProfileImpl ctor uses it in
@@ skipping 50 matching lines @@
 
   // Prepare parent host zoom map.
   HostZoomMap* parent_zoom_map =
       HostZoomMap::GetForBrowserContext(parent_profile.get());
   ASSERT_TRUE(parent_zoom_map);
 
   parent_zoom_map->SetZoomLevel(host, zoom_level_25);
   ASSERT_EQ(parent_zoom_map->GetZoomLevel(host), zoom_level_25);
 
   // TODO(yosin) We need to wait ProfileImpl::Observe done for
-  // NOTIFICATION_ZOOM_LEVEL_CHANGED.
+  // content::HostZoomMapObserver::OnZoomLevelChanged.
 
   // Prepare child profile as off the record profile.
   scoped_ptr<OffTheRecordProfileImpl> child_profile(
       new OffTheRecordProfileImpl(parent_profile.get()));
   child_profile->InitHostZoomMap();
 
   ProfileDependencyManager::GetInstance()->CreateProfileServices(
       child_profile.get(), false);
 
   // Prepare child host zoom map.
@@ skipping 15 matching lines @@
             child_zoom_map->GetZoomLevel(host)) <<
                 "Child change must not propagate to parent.";
 
   parent_zoom_map->SetZoomLevel(host, zoom_level_40);
   ASSERT_EQ(parent_zoom_map->GetZoomLevel(host), zoom_level_40);
 
   EXPECT_EQ(parent_zoom_map->GetZoomLevel(host),
             child_zoom_map->GetZoomLevel(host)) <<
                 "Parent change should propagate to child.";
 }