Check temporary zoom status when sending zoom level in navigation.

content/browser/host_zoom_map_impl.h

Index: content/browser/host_zoom_map_impl.h
diff --git a/content/browser/host_zoom_map_impl.h b/content/browser/host_zoom_map_impl.h
index f9002872e7c624a5fec63241d63fe1900e19fcc0..d5e6828dba670fe0f2898295d4b96307aa526489 100644
--- a/content/browser/host_zoom_map_impl.h
+++ b/content/browser/host_zoom_map_impl.h
@@ -79,6 +79,14 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
   double GetTemporaryZoomLevel(int render_process_id,
                                int render_view_id) const;
 
+  // Returns the zoom level regardless of whether it's temporary, host-keyed or
+  // scheme+host-keyed.
+  //
+  // This may be called on any thread.
+  double GetZoomLevelForView(const GURL& url,
+                             int render_process_id,
+                             int render_view_id) const;
+
   // NotificationObserver implementation.
   void Observe(int type,
                const NotificationSource& source,
@@ -107,6 +115,12 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
 
   double GetZoomLevelForHost(const std::string& host) const;
 
+  // Non-locked version for internal use. This should only be called within
+  // a scope where a lock has been acquired.

[Charlie Reis, 2015/02/12 21:51:41]

nit: versions
nit: These

[wjmaclean, 2015/02/13 15:57:53]

Done.

+  double GetZoomLevelForHostInternal(const std::string& host) const;
+  double GetZoomLevelForHostAndSchemeInternal(const std::string& scheme,
+                                              const std::string& host) const;
+
   // Notifies the renderers from this browser context to change the zoom level
   // for the specified host and scheme.
   // TODO(wjmaclean) Should we use a GURL here? crbug.com/384486