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..6248daf51c2b53408402d77fb66ee2e4f8638d84 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,
@@ -105,8 +113,16 @@ class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
 
   typedef std::map<RenderViewKey, double> TemporaryZoomLevels;
 
+  // Non-locked version for internal use. This should only be called within
+  // a scope where a lock has been acquired.
+  double GetZoomLevelForHostAndSchemeInternal(const std::string& scheme,

[Charlie Reis, 2015/02/11 20:56:34]

nit: This should be declared in the same order in the .h and .cc file.  Maybe it
makes sense to move this below GetZoomLevelForHost and have the comment apply to
both of the *Internal functions.

[wjmaclean, 2015/02/12 15:59:36]

Done.

+                                              const std::string& host) const;
   double GetZoomLevelForHost(const std::string& host) const;

[Charlie Reis, 2015/02/11 20:56:34]

nit: Put a blank line before this to clarify that the comment doesn't apply to
it.  (Unnecessary if you fix the first comment.)

[wjmaclean, 2015/02/12 15:59:36]

Done.

 
+  // Non-locked version for internal use. This should only be called within
+  // a scope where a lock has been acquired.
+  double GetZoomLevelForHostInternal(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