Revert "Replace the GetAssociatedRenderView call with GetAssociatedRenderFrame in ResourceLoader and SSLClientAuthHandler."

This reverts commit 6952f00643ee2d1a58177dd90f35e3542690cc87.

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

7 files changed, 18 insertions, 18 deletions

diff --git a/content/browser/ssl/ssl_cert_error_handler.cc b/content/browser/ssl/ssl_cert_error_handler.cc
index a69e993..b3bdb41 100644
--- a/content/browser/ssl/ssl_cert_error_handler.cc
+++ b/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) {
diff --git a/content/browser/ssl/ssl_cert_error_handler.h b/content/browser/ssl/ssl_cert_error_handler.h
index 6946f42..696fb81 100644
--- a/content/browser/ssl/ssl_cert_error_handler.h
+++ b/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);
 
diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc
index ed4c2ac..8a322f7 100644
--- a/content/browser/ssl/ssl_error_handler.cc
+++ b/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
diff --git a/content/browser/ssl/ssl_error_handler.h b/content/browser/ssl/ssl_error_handler.h
index 87bc1da..5f9e9e5 100644
--- a/content/browser/ssl/ssl_error_handler.h
+++ b/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.
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 68906ce..b1eb51e 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -53,7 +53,7 @@ void SSLManager::OnSSLCertificateError(
     const 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) {
   DCHECK(delegate.get());
@@ -61,7 +61,7 @@ void SSLManager::OnSSLCertificateError(
            << net::MapCertStatusToNetError(ssl_info.cert_status) << " id: "
            << id.child_id << "," << id.request_id << " resource_type: "
            << resource_type << " url: " << url.spec() << " render_process_id: "
-           << render_process_id << " render_frame_id: " << render_frame_id
+           << render_process_id << " render_view_id: " << render_view_id
            << " cert_status: " << std::hex << ssl_info.cert_status;
 
   // A certificate error occurred.  Construct a SSLCertErrorHandler object and
@@ -74,7 +74,7 @@ void SSLManager::OnSSLCertificateError(
                                          resource_type,
                                          url,
                                          render_process_id,
-                                         render_frame_id,
+                                         render_view_id,
                                          ssl_info,
                                          fatal)));
 }
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index c195e98..45100a7 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -54,7 +54,7 @@ class SSLManager {
       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);
 
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 1127f8d..ddf9e4c 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -187,7 +187,7 @@ void SSLPolicy::OnCertErrorInternal(SSLCertErrorHandler* handler,
       CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE;
   GetContentClient()->browser()->AllowCertificateError(
       handler->render_process_id(),
-      handler->render_frame_id(),
+      handler->render_view_id(),
       handler->cert_error(),
       handler->ssl_info(),
       handler->request_url(),