Migrate HostZoomMap to live in StoragePartition.

chrome/browser/ui/zoom/zoom_controller.cc

Index: chrome/browser/ui/zoom/zoom_controller.cc
diff --git a/chrome/browser/ui/zoom/zoom_controller.cc b/chrome/browser/ui/zoom/zoom_controller.cc
index b17f3a99e4e188a114cdf5dc50daaf18fe26a715..cff2ee7ac29c8f3caf9656c5673d64f7850a04b0 100644
--- a/chrome/browser/ui/zoom/zoom_controller.cc
+++ b/chrome/browser/ui/zoom/zoom_controller.cc
@@ -40,10 +40,10 @@ ZoomController::ZoomController(content::WebContents* web_contents)
           &ZoomController::UpdateState, base::Unretained(this), std::string()));
   zoom_level_ = default_zoom_level_.GetValue();
 
-  zoom_subscription_ = content::HostZoomMap::GetForBrowserContext(
-      browser_context_)->AddZoomLevelChangedCallback(
-          base::Bind(&ZoomController::OnZoomLevelChanged,
-                     base::Unretained(this)));
+  zoom_subscription_ =
+      content::HostZoomMap::GetForWebContents(web_contents)
+          ->AddZoomLevelChangedCallback(base::Bind(
+              &ZoomController::OnZoomLevelChanged, base::Unretained(this)));
 
   UpdateState(std::string());
 }
@@ -124,7 +124,7 @@ bool ZoomController::SetZoomLevelByExtension(
   }
 
   content::HostZoomMap* zoom_map =
-      content::HostZoomMap::GetForBrowserContext(browser_context_);
+      content::HostZoomMap::GetForWebContents(web_contents());
   DCHECK(zoom_map);
   DCHECK(!event_data_);
   event_data_.reset(new ZoomChangedEventData(web_contents(),
@@ -160,7 +160,7 @@ void ZoomController::SetZoomMode(ZoomMode new_mode) {
     return;
 
   content::HostZoomMap* zoom_map =
-      content::HostZoomMap::GetForBrowserContext(browser_context_);
+      content::HostZoomMap::GetForWebContents(web_contents());
   DCHECK(zoom_map);
   int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();