Upstream ShouldOverrideUrlLoading changes

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.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 "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_login_delegate.h"
@@ skipping 205 matching lines @@
   // request relates to a not-yet-created popup window, then the client will
   // be non-NULL but PopupPendingAssociation() will be set.
   scoped_ptr<AwContentsIoThreadClient> io_client =
       AwContentsIoThreadClient::FromID(child_id, route_id);
   if (!io_client)
     return;
 
   throttles->push_back(new IoThreadClientThrottle(
       child_id, route_id, request));
 
-  bool allow_intercepting =
-      // We allow intercepting navigations within subframes, but only if the
-      // scheme other than http or https. This is because the embedder
-      // can't distinguish main frame and subframe callbacks (which could lead
-      // to broken content if the embedder decides to not ignore the main frame
-      // navigation, but ignores the subframe navigation).
-      // The reason this is supported at all is that certain JavaScript-based
-      // frameworks use iframe navigation as a form of communication with the
-      // embedder.
-      (resource_type == ResourceType::MAIN_FRAME ||
-       (resource_type == ResourceType::SUB_FRAME &&
-        !request->url().SchemeIs(content::kHttpScheme) &&
-        !request->url().SchemeIs(content::kHttpsScheme)));
-  if (allow_intercepting) {
+  // We allow intercepting only navigations within main frames. This

[mkosiba (inactive), 2013/10/17 10:27:45]

This is misleading. We're not really using the throttle for intercepting
anymore. Please rephrase to say "We're only using the
InterceptNavigationDelegate to send an onPageStarted callback, which is only
issued for navigations within main frames. The navigation
interception/shouldOverrideUrlLoading implementation is now handled using
synchronous IPC."

[sgurun-gerrit only, 2013/12/06 00:17:48]

Done.

+  // is used to post onPageStarted. We handle shouldOverrideUrlLoading
+  // via a sync IPC.
+  if (resource_type == ResourceType::MAIN_FRAME)
     throttles->push_back(InterceptNavigationDelegate::CreateThrottleFor(
         request));
-  }
 }
 
 void AwResourceDispatcherHostDelegate::DownloadStarting(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     int child_id,
     int route_id,
     int request_id,
     bool is_content_initiated,
     bool must_download,
@@ skipping 135 matching lines @@
       ChildRouteIDPair(new_child_id, new_route_id));
 
   if (it != pending_throttles_.end()) {
     IoThreadClientThrottle* throttle = it->second;
     throttle->OnIoThreadClientReady(new_child_id, new_route_id);
     pending_throttles_.erase(it);
   }
 }
 
 }  // namespace android_webview