Check temporary zoom status when sending zoom level in navigation.

content/browser/loader/async_resource_handler.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/loader/async_resource_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 175 matching lines @@
   if (!info->filter())
     return false;
 
   if (rdh_->delegate()) {
     rdh_->delegate()->OnResponseStarted(
         request(), info->GetContext(), response, info->filter());
   }
 
   DevToolsNetLogObserver::PopulateResponseInfo(request(), response);
 
-  const HostZoomMap* host_zoom_map = info->filter()->GetHostZoomMap();
+  const HostZoomMapImpl* host_zoom_map =
+      static_cast<const HostZoomMapImpl*>(info->filter()->GetHostZoomMap());
 
   if (info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME && host_zoom_map) {
     const GURL& request_url = request()->url();
+    int render_process_id = info->GetChildID();
+    int render_view_id = info->GetRouteID();
+
+    // TODO(wjmaclean): verify that using the full request url (without passing
+    // an empty scheme as we used to) doesn't break anything.

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

This doesn't instill confidence.  :)  Can we test this?

Also, I'm not sure I understand the comment, since you do call .scheme() in the
implementation.  What empty scheme are you referring to?

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

Gah, just realized we're not changing anything! *Many* places just put in an
empty string for scheme, but ARH is one of the few that don't.

Nothing will break here.

+    double zoom_level = host_zoom_map->GetZoomLevelForView(
+        request_url, render_process_id, render_view_id);
+
     info->filter()->Send(new ViewMsg_SetZoomLevelForLoadingURL(
-        info->GetRouteID(),
-        request_url, host_zoom_map->GetZoomLevelForHostAndScheme(
-            request_url.scheme(),
-            net::GetHostOrSpecFromURL(request_url))));
+        render_view_id, request_url, zoom_level));
   }
 
   // If the parent handler downloaded the resource to a file, grant the child
   // read permissions on it.
   if (!response->head.download_file_path.empty()) {
     rdh_->RegisterDownloadedTempFile(
         info->GetChildID(), info->GetRequestID(),
         response->head.download_file_path);
   }
 
@@ skipping 185 matching lines @@
     request()->LogUnblocked();
     controller()->Resume();
   }
 }
 
 void AsyncResourceHandler::OnDefer() {
   request()->LogBlockedBy("AsyncResourceHandler");
 }
 
 }  // namespace content