Move NewLoginRequest plumbing to AwContentsClientBridge

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 <memory>
 #include <string>
 
 #include "android_webview/browser/aw_browser_context.h"
@@ skipping 48 matching lines @@
 // Called when ResourceDispathcerHost detects a download request.
 // The download is already cancelled when this is called, since
 // relevant for DownloadListener is already extracted.
 void DownloadStartingOnUIThread(
     const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
     const GURL& url,
     const std::string& user_agent,
     const std::string& content_disposition,
     const std::string& mime_type,
     int64_t content_length) {
-  WebContents* web_contents = web_contents_getter.Run();
   AwContentsClientBridgeBase* client =
-      AwContentsClientBridgeBase::FromWebContents(web_contents);
+      AwContentsClientBridgeBase::FromWebContentsGetter(web_contents_getter);
   if (!client)
     return;
   client->NewDownload(url, user_agent, content_disposition, mime_type,
                       content_length);
 }
 
+void NewLoginRequestOnUIThread(
+    const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
+    const std::string& realm,
+    const std::string& account,
+    const std::string& args) {
+  AwContentsClientBridgeBase* client =
+      AwContentsClientBridgeBase::FromWebContentsGetter(web_contents_getter);
+  if (!client)
+    return;
+  client->NewLoginRequest(realm, account, args);
+}
+
 }  // namespace
 
 namespace android_webview {
 
 // Calls through the IoThreadClient to check the embedders settings to determine
 // if the request should be cancelled. There may not always be an IoThreadClient
 // available for the |render_process_id|, |render_frame_id| pair (in the case of
 // newly created pop up windows, for example) and in that case the request and
 // the client callbacks will be deferred the request until a client is ready.
 class IoThreadClientThrottle : public content::ResourceThrottle {
@@ skipping 264 matching lines @@
   if (!request_info) {
     DLOG(FATAL) << "Started request without associated info: " <<
         request->url();
     return;
   }
 
   if (request_info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME) {
     // Check for x-auto-login header.
     HeaderData header_data;
     if (ParserHeaderInResponse(request, ALLOW_ANY_REALM, &header_data)) {
-      std::unique_ptr<AwContentsIoThreadClient> io_client =
-          AwContentsIoThreadClient::FromID(request_info->GetChildID(),
-                                           request_info->GetRenderFrameID());
-      if (io_client) {
-        io_client->NewLoginRequest(header_data.realm, header_data.account,
-                                   header_data.args);
-      }
+      BrowserThread::PostTask(
+          BrowserThread::UI, FROM_HERE,
+          base::Bind(&NewLoginRequestOnUIThread,
+                     request_info->GetWebContentsGetterForRequest(),
+                     header_data.realm, header_data.account, header_data.args));
     }
   }
 }
 
 void AwResourceDispatcherHostDelegate::RemovePendingThrottleOnIoThread(
     IoThreadClientThrottle* throttle) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   PendingThrottleMap::iterator it = pending_throttles_.find(
       FrameRouteIDPair(throttle->render_process_id(),
                        throttle->render_frame_id()));
@@ skipping 76 matching lines @@
       net::HttpRequestHeaders headers;
       headers.AddHeadersFromString(extra_headers);
       for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext(); ) {
         request->SetExtraRequestHeaderByName(it.name(), it.value(), false);
       }
     }
   }
 }
 
 }  // namespace android_webview