Move creation and ownership of HostZoomMap to content instead of having every embedder do this.

content/browser/renderer_host/render_view_host.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 "content/browser/renderer_host/render_view_host.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 45 matching lines @@
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webdropdata.h"
 
 using base::TimeDelta;
 using content::BrowserContext;
 using content::BrowserMessageFilter;
 using content::BrowserThread;
 using content::DomOperationNotificationDetails;
+using content::HostZoomMap;
 using content::RenderViewHostDelegate;
 using content::SiteInstance;
 using content::UserMetricsAction;
 using WebKit::WebConsoleMessage;
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationNone;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebInputEvent;
 using WebKit::WebMediaPlayerAction;
 using WebKit::WebPluginAction;
@@ skipping 1410 matching lines @@
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
       content::Source<RenderViewHost>(this),
       content::Details<std::pair<int, Value*> >(&details));
 }
 
 void RenderViewHost::OnDidZoomURL(double zoom_level,
                                   bool remember,
                                   const GURL& url) {
   HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>(
-      process()->GetBrowserContext()->GetHostZoomMap());
+      HostZoomMap::GetForBrowserContext(process()->GetBrowserContext()));
   if (remember) {
     host_zoom_map->SetZoomLevel(net::GetHostOrSpecFromURL(url), zoom_level);
   } else {
     host_zoom_map->SetTemporaryZoomLevel(
         process()->GetID(), routing_id(), zoom_level);
   }
 }
 
 void RenderViewHost::OnMediaNotification(int64 player_cookie,
                                          bool has_video,
@@ skipping 84 matching lines @@
   // Whenever we change swap out state, we should not be waiting for
   // beforeunload or unload acks.  We clear them here to be safe, since they
   // can cause navigations to be ignored in OnMsgNavigate.
   is_waiting_for_beforeunload_ack_ = false;
   is_waiting_for_unload_ack_ = false;
 }
 
 void RenderViewHost::ClearPowerSaveBlockers() {
   STLDeleteValues(&power_save_blockers_);
 }