Revert "Replace the GetAssociatedRenderView call with GetAssociatedRe…

…nderFrame in ResourceLoader and SSLClientAuthHandler."

This reverts commit 6952f00.

Gardening. This patch breaks 33 layout tests
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20Blink&tests=fast/encoding/mailto-always-utf-8.html,fast/forms/mailto/advanced-get.html,fast/forms/mailto/advanced-put.html,fast/forms/mailto/formenctype-attribute-button-html.html,fast/forms/mailto/formenctype-attribute-input-2.html,fast/forms/mailto/formenctype-attribute-input-html.html,fast/forms/mailto/get-multiple-items-text-plain.html,fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html,fast/forms/mailto/get-multiple-items.html,fast/forms/mailto/get-non-ascii-always-utf-8.html,fast/forms/mailto/get-non-ascii-text-plain-latin-1.html,fast/forms/mailto/get-non-ascii-text-plain.html,fast/forms/mailto/get-non-ascii.html,fast/forms/mailto/get-overwrite-query.html,fast/forms/mailto/post-append-query.html,fast/forms/mailto/post-multiple-items-multipart-form-data.html,fast/forms/mailto/post-multiple-items-text-plain.html,fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html,fast/forms/mailto/post-multiple-items.html,fast/forms/mailto/post-text-plain-with-accept-charset.html,fast/forms/mailto/post-text-plain.html,fast/loader/onload-policy-ignore-for-frame.html,fast/loader/reload-policy-delegate.html,http/tests/download/basic-ascii.html,http/tests/download/default-encoding.html,http/tests/download/inherited-encoding-form-submission-result.html,http/tests/download/inherited-encoding.html,http/tests/download/literal-utf-8.html,http/tests/history/back-to-post.html,http/tests/media/media-source/mediasource-remove.html,http/tests/misc/policy-delegate-called-twice.html,http/tests/navigation/post-redirect-get-reload.php,http/tests/security/feed-urls-from-remote.html

BUG=
TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/101723004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242716 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/browser/aw_content_browser_client.cc

@@ -91,13 +91,13 @@ bool AwContentsMessageFilter::OnMessageReceived(const IPC::Message& message,
 }
 
 void AwContentsMessageFilter::OnShouldOverrideUrlLoading(
-    int render_frame_id,
+    int routing_id,
     const base::string16& url,
     bool* ignore_navigation) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   *ignore_navigation = false;
   AwContentsClientBridgeBase* client =
-      AwContentsClientBridgeBase::FromID(process_id_, render_frame_id);
+      AwContentsClientBridgeBase::FromID(process_id_, routing_id);
   if (client) {
     *ignore_navigation = client->ShouldOverrideUrlLoading(url);
   } else {
@@ -318,7 +318,7 @@ AwContentBrowserClient::CreateQuotaPermissionContext() {
 
 void AwContentBrowserClient::AllowCertificateError(
     int render_process_id,
-    int render_frame_id,
+    int render_view_id,
     int cert_error,
     const net::SSLInfo& ssl_info,
     const GURL& request_url,
@@ -327,8 +327,9 @@ void AwContentBrowserClient::AllowCertificateError(
     bool strict_enforcement,
     const base::Callback<void(bool)>& callback,
     content::CertificateRequestResultType* result) {
+
   AwContentsClientBridgeBase* client =
-      AwContentsClientBridgeBase::FromID(render_process_id, render_frame_id);
+      AwContentsClientBridgeBase::FromID(render_process_id, render_view_id);
   bool cancel_request = true;
   if (client)
     client->AllowCertificateError(cert_error,

android_webview/browser/aw_content_browser_client.h

@@ -94,7 +94,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
       CreateQuotaPermissionContext() OVERRIDE;
   virtual void AllowCertificateError(
       int render_process_id,
-      int render_frame_id,
+      int render_view_id,
       int cert_error,
       const net::SSLInfo& ssl_info,
       const GURL& request_url,

android_webview/browser/aw_contents_client_bridge_base.cc

@@ -5,7 +5,7 @@
 #include "android_webview/browser/aw_contents_client_bridge_base.h"
 
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 using content::BrowserThread;
@@ -56,13 +56,13 @@ AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromWebContents(
 // static
 AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromID(
     int render_process_id,
-    int render_frame_id) {
+    int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  content::RenderFrameHost* rfh =
-      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-  if (!rfh) return NULL;
+  const content::RenderViewHost* rvh =
+      content::RenderViewHost::FromID(render_process_id, render_view_id);
+  if (!rvh) return NULL;
   content::WebContents* web_contents =
-      content::WebContents::FromRenderFrameHost(rfh);
+      content::WebContents::FromRenderViewHost(rvh);
   return UserData::GetContents(web_contents);
 }
 

android_webview/browser/aw_contents_client_bridge_base.h

@@ -34,7 +34,7 @@ class AwContentsClientBridgeBase {
   static AwContentsClientBridgeBase* FromWebContents(
       content::WebContents* web_contents);
   static AwContentsClientBridgeBase* FromID(int render_process_id,
-                                            int render_frame_id);
+                                            int render_view_id);
 
   virtual ~AwContentsClientBridgeBase();
 

android_webview/common/render_view_messages.h

@@ -107,6 +107,6 @@ IPC_MESSAGE_ROUTED1(AwViewHostMsg_OnContentsSizeChanged,
 // cornercases. This is sent before updating the NavigationController state
 // or creating a URLRequest for the main frame resource.
 IPC_SYNC_MESSAGE_CONTROL2_1(AwViewHostMsg_ShouldOverrideUrlLoading,
-                            int /* render_frame_id id */,
+                            int /* routing id */,
                             base::string16 /* in - url */,
                             bool /* out - result */)

android_webview/renderer/aw_content_renderer_client.cc

@@ -19,8 +19,8 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
-#include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
+#include "content/public/renderer/render_view.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ -60,7 +60,7 @@ void AwContentRendererClient::RenderThreadStarted() {
 }
 
 bool AwContentRendererClient::HandleNavigation(
-    content::RenderFrame* render_frame,
+    content::RenderView* view,
     content::DocumentState* document_state,
     int opener_id,
     blink::WebFrame* frame,
@@ -107,9 +107,9 @@ bool AwContentRendererClient::HandleNavigation(
   bool ignore_navigation = false;
   base::string16 url =  request.url().string();
 
-  int render_frame_id = render_frame->GetRoutingID();
+  int routing_id = view->GetRoutingID();
   RenderThread::Get()->Send(new AwViewHostMsg_ShouldOverrideUrlLoading(
-      render_frame_id, url, &ignore_navigation));
+      routing_id, url, &ignore_navigation));
   return ignore_navigation;
 }
 

android_webview/renderer/aw_content_renderer_client.h

@@ -41,7 +41,7 @@ class AwContentRendererClient : public content::ContentRendererClient {
   virtual void AddKeySystems(
       std::vector<content::KeySystemInfo>* key_systems) OVERRIDE;
 
-  virtual bool HandleNavigation(content::RenderFrame* render_frame,
+  virtual bool HandleNavigation(content::RenderView* view,
                                 content::DocumentState* document_state,
                                 int opener_id,
                                 blink::WebFrame* frame,

chrome/browser/chrome_content_browser_client.cc

@@ -1752,7 +1752,7 @@ ChromeContentBrowserClient::CreateQuotaPermissionContext() {
 
 void ChromeContentBrowserClient::AllowCertificateError(
     int render_process_id,
-    int render_frame_id,
+    int render_view_id,
     int cert_error,
     const net::SSLInfo& ssl_info,
     const GURL& request_url,
@@ -1771,13 +1771,8 @@ void ChromeContentBrowserClient::AllowCertificateError(
   }
 
   // If the tab is being prerendered, cancel the prerender and the request.
-  content::RenderFrameHost* render_frame_host =
-      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-  if (!render_frame_host) {
-    NOTREACHED();
-    return;
-  }
-  WebContents* tab = WebContents::FromRenderFrameHost(render_frame_host);
+  WebContents* tab = tab_util::GetWebContentsByID(
+      render_process_id, render_view_id);
   if (!tab) {
     NOTREACHED();
     return;
@@ -1788,8 +1783,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
   if (prerender_manager && prerender_manager->IsWebContentsPrerendering(tab,
                                                                         NULL)) {
     if (prerender_manager->prerender_tracker()->TryCancel(
-            render_process_id,
-            render_frame_host->GetRenderViewHost()->GetRoutingID(),
+            render_process_id, render_view_id,
             prerender::FINAL_STATUS_SSL_ERROR)) {
       *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL;
       return;

chrome/browser/chrome_content_browser_client.h

@@ -154,7 +154,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       CreateQuotaPermissionContext() OVERRIDE;
   virtual void AllowCertificateError(
       int render_process_id,
-      int render_frame_id,
+      int render_view_id,
       int cert_error,
       const net::SSLInfo& ssl_info,
       const GURL& request_url,

content/browser/frame_host/render_frame_host_impl.cc

@@ -95,10 +95,6 @@ gfx::NativeView RenderFrameHostImpl::GetNativeView() {
   return view->GetNativeView();
 }
 
-RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() {
-  return render_view_host_;
-}
-
 bool RenderFrameHostImpl::Send(IPC::Message* message) {
   return GetProcess()->Send(message);
 }

content/browser/frame_host/render_frame_host_impl.h

@@ -36,7 +36,6 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
   virtual RenderProcessHost* GetProcess() OVERRIDE;
   virtual int GetRoutingID() OVERRIDE;
   virtual gfx::NativeView GetNativeView() OVERRIDE;
-  virtual RenderViewHost* GetRenderViewHost() OVERRIDE;
 
   // IPC::Sender
   virtual bool Send(IPC::Message* msg) OVERRIDE;

content/browser/loader/resource_loader.cc

@@ -279,8 +279,8 @@ void ResourceLoader::OnSSLCertificateError(net::URLRequest* request,
   ResourceRequestInfoImpl* info = GetRequestInfo();
 
   int render_process_id;
-  int render_frame_id;
-  if (!info->GetAssociatedRenderFrame(&render_process_id, &render_frame_id))
+  int render_view_id;
+  if (!info->GetAssociatedRenderView(&render_process_id, &render_view_id))
     NOTREACHED();
 
   SSLManager::OnSSLCertificateError(
@@ -289,7 +289,7 @@ void ResourceLoader::OnSSLCertificateError(net::URLRequest* request,
       info->GetResourceType(),
       request_->url(),
       render_process_id,
-      render_frame_id,
+      render_view_id,
       ssl_info,
       fatal);
 }

content/browser/renderer_host/socket_stream_dispatcher_host.cc

@@ -144,7 +144,7 @@ void SocketStreamDispatcherHost::OnSSLCertificateError(
   GlobalRequestID request_id(-1, socket_id);
   SSLManager::OnSSLCertificateError(
       weak_ptr_factory_.GetWeakPtr(), request_id, ResourceType::SUB_RESOURCE,
-      socket->url(), render_process_id_, socket_stream_host->render_frame_id(),
+      socket->url(), render_process_id_, socket_stream_host->render_view_id(),
       ssl_info, fatal);
 }
 
@@ -195,11 +195,11 @@ SocketStreamDispatcherHost::~SocketStreamDispatcherHost() {
 }
 
 // Message handlers called by OnMessageReceived.
-void SocketStreamDispatcherHost::OnConnect(int render_frame_id,
+void SocketStreamDispatcherHost::OnConnect(int render_view_id,
                                            const GURL& url,
                                            int socket_id) {
   DVLOG(2) << "SocketStreamDispatcherHost::OnConnect"
-           << " render_frame_id=" << render_frame_id
+           << " render_view_id=" << render_view_id
            << " url=" << url
            << " socket_id=" << socket_id;
   DCHECK_NE(kNoSocketId, socket_id);
@@ -223,7 +223,7 @@ void SocketStreamDispatcherHost::OnConnect(int render_frame_id,
   // Note that the SocketStreamHost is responsible for checking that |url|
   // is valid.
   SocketStreamHost* socket_stream_host =
-      new SocketStreamHost(this, render_frame_id, socket_id);
+      new SocketStreamHost(this, render_view_id, socket_id);
   hosts_.AddWithID(socket_stream_host, socket_id);
   socket_stream_host->Connect(url, GetURLRequestContext());
   DVLOG(2) << "SocketStreamDispatcherHost::OnConnect -> " << socket_id;

content/browser/renderer_host/socket_stream_dispatcher_host.h

@@ -76,7 +76,7 @@ class SocketStreamDispatcherHost
 
  private:
   // Message handlers called by OnMessageReceived.
-  void OnConnect(int render_frame_id, const GURL& url, int socket_id);
+  void OnConnect(int render_view_id, const GURL& url, int socket_id);
   void OnSendData(int socket_id, const std::vector<char>& data);
   void OnCloseReq(int socket_id);
 

content/browser/renderer_host/socket_stream_host.cc

@@ -28,13 +28,13 @@ class SocketStreamId : public net::SocketStream::UserData {
 
 SocketStreamHost::SocketStreamHost(
     net::SocketStream::Delegate* delegate,
-    int render_frame_id,
+    int render_view_id,
     int socket_id)
     : delegate_(delegate),
-      render_frame_id_(render_frame_id),
+      render_view_id_(render_view_id),
       socket_id_(socket_id) {
   DCHECK_NE(socket_id_, kNoSocketId);
-  VLOG(1) << "SocketStreamHost: render_frame_id=" << render_frame_id
+  VLOG(1) << "SocketStreamHost: render_view_id=" << render_view_id
           << " socket_id=" << socket_id_;
 }
 

content/browser/renderer_host/socket_stream_host.h

@@ -29,14 +29,14 @@ namespace content {
 class SocketStreamHost {
  public:
   SocketStreamHost(net::SocketStream::Delegate* delegate,
-                   int render_frame_id,
+                   int render_view_id,
                    int socket_id);
   ~SocketStreamHost();
 
   // Gets socket_id associated with |socket|.
   static int SocketIdFromSocketStream(const net::SocketStream* socket);
 
-  int render_frame_id() const { return render_frame_id_; }
+  int render_view_id() const { return render_view_id_; }
   int socket_id() const { return socket_id_; }
 
   // Starts to open connection to |url|.
@@ -66,7 +66,7 @@ class SocketStreamHost {
 
  private:
   net::SocketStream::Delegate* delegate_;
-  int render_frame_id_;
+  int render_view_id_;
   int socket_id_;
 
   scoped_refptr<net::SocketStreamJob> job_;

content/browser/ssl/ssl_cert_error_handler.cc

@@ -17,11 +17,11 @@ SSLCertErrorHandler::SSLCertErrorHandler(
     ResourceType::Type resource_type,
     const GURL& url,
     int render_process_id,
-    int render_frame_id,
+    int render_view_id,
     const net::SSLInfo& ssl_info,
     bool fatal)
     : SSLErrorHandler(delegate, id, resource_type, url, render_process_id,
-                      render_frame_id),
+          render_view_id),
       ssl_info_(ssl_info),
       cert_error_(net::MapCertStatusToNetError(ssl_info.cert_status)),
       fatal_(fatal) {

content/browser/ssl/ssl_cert_error_handler.h

@@ -24,7 +24,7 @@ class SSLCertErrorHandler : public SSLErrorHandler {
                       ResourceType::Type resource_type,
                       const GURL& url,
                       int render_process_id,
-                      int render_frame_id,
+                      int render_view_id,
                       const net::SSLInfo& ssl_info,
                       bool fatal);
 

content/browser/ssl/ssl_error_handler.cc

@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
-#include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
@@ -23,12 +23,12 @@ SSLErrorHandler::SSLErrorHandler(const base::WeakPtr<Delegate>& delegate,
                                  ResourceType::Type resource_type,
                                  const GURL& url,
                                  int render_process_id,
-                                 int render_frame_id)
+                                 int render_view_id)
     : manager_(NULL),
       request_id_(id),
       delegate_(delegate),
       render_process_id_(render_process_id),
-      render_frame_id_(render_frame_id),
+      render_view_id_(render_view_id),
       request_url_(url),
       resource_type_(resource_type),
       request_has_been_notified_(false) {
@@ -61,10 +61,10 @@ void SSLErrorHandler::Dispatch() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   WebContents* web_contents = NULL;
-  RenderFrameHost* render_frame_host =
-      RenderFrameHost::FromID(render_process_id_, render_frame_id_);
-  if (render_frame_host)
-    web_contents = WebContents::FromRenderFrameHost(render_frame_host);
+  RenderViewHostImpl* render_view_host =
+      RenderViewHostImpl::FromID(render_process_id_, render_view_id_);
+  if (render_view_host)
+    web_contents = render_view_host->GetDelegate()->GetAsWebContents();
 
   if (!web_contents) {
     // We arrived on the UI thread, but the tab we're looking for is no longer

content/browser/ssl/ssl_error_handler.h

@@ -101,7 +101,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
   void TakeNoAction();
 
   int render_process_id() const { return render_process_id_; }
-  int render_frame_id() const { return render_frame_id_; }
+  int render_view_id() const { return render_view_id_; }
 
  protected:
   friend class base::RefCountedThreadSafe<SSLErrorHandler>;
@@ -112,7 +112,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
                   ResourceType::Type resource_type,
                   const GURL& url,
                   int render_process_id,
-                  int render_frame_id);
+                  int render_view_id);
 
   virtual ~SSLErrorHandler();
 
@@ -149,7 +149,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
   // We use these members to find the correct SSLManager when we arrive on
   // the UI thread.
   int render_process_id_;
-  int render_frame_id_;
+  int render_view_id_;
 
   // The URL that we requested.
   // This read-only member can be accessed on any thread.