Convert zoom callbacks to use CallbackRegistry

chrome/browser/profiles/off_the_record_profile_impl.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 72 matching lines @@
   ExtensionWebRequestEventRouter::GetInstance()->OnOTRProfileDestroyed(
       original_profile, otr_profile);
 }
 
 }  // namespace
 
 OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile)
     : profile_(real_profile),
       prefs_(PrefServiceSyncable::IncognitoFromProfile(real_profile)),
       io_data_(this),
-      start_time_(Time::Now()),
-      zoom_callback_(base::Bind(&OffTheRecordProfileImpl::OnZoomLevelChanged,
-                                base::Unretained(this))) {
+      start_time_(Time::Now()) {
   // Register on BrowserContext.
   user_prefs::UserPrefs::Set(this, prefs_);
 }
 
 void OffTheRecordProfileImpl::Init() {
   BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
       this);
 
   DCHECK_NE(IncognitoModePrefs::DISABLED,
             IncognitoModePrefs::GetAvailability(profile_->GetPrefs()));
@@ skipping 24 matching lines @@
 #endif
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&NotifyOTRProfileCreatedOnIOThread, profile_, this));
 }
 
 OffTheRecordProfileImpl::~OffTheRecordProfileImpl() {
   MaybeSendDestroyedNotification();
 
-  HostZoomMap::GetForBrowserContext(profile_)->RemoveZoomLevelChangedCallback(
-      zoom_callback_);
-
 #if defined(ENABLE_PLUGINS)
   ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext(
     io_data_.GetResourceContextNoInit());
 #endif
 
   BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
       this);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ skipping 10 matching lines @@
   g_browser_process->io_thread()->ChangedToOnTheRecord();
 }
 
 void OffTheRecordProfileImpl::InitHostZoomMap() {
   HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
   HostZoomMap* parent_host_zoom_map =
       HostZoomMap::GetForBrowserContext(profile_);
   host_zoom_map->CopyFrom(parent_host_zoom_map);
   // Observe parent's HZM change for propagating change of parent's
   // change to this HZM.
-  parent_host_zoom_map->AddZoomLevelChangedCallback(zoom_callback_);
+  zoom_subscription_ = parent_host_zoom_map->AddZoomLevelChangedCallback(
+      base::Bind(&OffTheRecordProfileImpl::OnZoomLevelChanged,
+                 base::Unretained(this)));
 }
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
 void OffTheRecordProfileImpl::UseSystemProxy() {
   // Force the use of the system-assigned proxy when off the record.
   const char kProxyMode[] = "mode";
   const char kProxyServer[] = "server";
   const char kProxyBypassList[] = "bypass_list";
   const char kProxyPacUrl[] = "pac_url";
   DictionaryPrefUpdate update(prefs_, prefs::kProxy);
@@ skipping 301 matching lines @@
 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
 #if defined(OS_CHROMEOS)
   if (chromeos::ProfileHelper::IsSigninProfile(this)) {
     return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
         g_browser_process->local_state());
   }
 #endif  // defined(OS_CHROMEOS)
   return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
       GetPrefs(), g_browser_process->local_state());
 }