Network Service: Change |is_main_frame| variable name to |is_request_for_main_frame|

Based on the discussion at:
https://chromium-review.googlesource.com/c/chromium/src/+/1050935/5/content/browser/network_service_client.cc
This CL changes the |is_main_frame| variable name to |is_request_for_main_frame|
to make it more clear. The variable indicates if the request (associated
with a frame) is the request for the frame itself or a subresource.

Bug: 783990
Change-Id: I0369efc027c27cac3c19a1ce48a0fba7a67809a0
Reviewed-on: https://chromium-review.googlesource.com/1056292Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Jun Cai <juncai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558411}

chrome/browser/chrome_content_browser_client.cc

@@ -4192,11 +4192,12 @@ scoped_refptr<content::LoginDelegate>
 ChromeContentBrowserClient::CreateLoginDelegate(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-    bool is_main_frame,
+    bool is_request_for_main_frame,
     const GURL& url,
     bool first_auth_attempt,
     LoginAuthRequiredCallback auth_required_callback) {
-  return CreateLoginPrompt(auth_info, web_contents_getter, is_main_frame, url,
+  return CreateLoginPrompt(auth_info, web_contents_getter,
+                           is_request_for_main_frame, url,
                            std::move(auth_required_callback));
 }
 

chrome/browser/chrome_content_browser_client.h

@@ -422,7 +422,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   scoped_refptr<content::LoginDelegate> CreateLoginDelegate(
       net::AuthChallengeInfo* auth_info,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-      bool is_main_frame,
+      bool is_request_for_main_frame,
       const GURL& url,
       bool first_auth_attempt,
       LoginAuthRequiredCallback auth_required_callback) override;

chrome/browser/ui/login/login_handler.cc

@@ -597,7 +597,7 @@ void LoginHandler::ShowLoginPrompt(const GURL& request_url,
 void LoginHandler::LoginDialogCallback(const GURL& request_url,
                                        net::AuthChallengeInfo* auth_info,
                                        LoginHandler* handler,
-                                       bool is_main_frame) {
+                                       bool is_request_for_main_frame) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   WebContents* parent_contents = handler->GetWebContentsForLogin();
   if (!parent_contents || handler->WasAuthHandled()) {
@@ -637,7 +637,7 @@ void LoginHandler::LoginDialogCallback(const GURL& request_url,
   const bool is_cross_origin_request =
       parent_contents->GetLastCommittedURL().GetOrigin() !=
       request_url.GetOrigin();
-  if (is_main_frame &&
+  if (is_request_for_main_frame &&
       (is_cross_origin_request || parent_contents->ShowingInterstitialPage() ||
        auth_info->is_proxy) &&
       parent_contents->GetDelegate()->GetDisplayMode(parent_contents) !=
@@ -658,7 +658,7 @@ void LoginHandler::LoginDialogCallback(const GURL& request_url,
             ->GetWeakPtr());
 
   } else {
-    if (is_main_frame) {
+    if (is_request_for_main_frame) {
       RecordHttpAuthPromptType(AUTH_PROMPT_TYPE_MAIN_FRAME);
     } else {
       RecordHttpAuthPromptType(is_cross_origin_request
@@ -674,7 +674,7 @@ void LoginHandler::LoginDialogCallback(const GURL& request_url,
 scoped_refptr<LoginHandler> CreateLoginPrompt(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-    bool is_main_frame,
+    bool is_request_for_main_frame,
     const GURL& url,
     LoginAuthRequiredCallback auth_required_callback) {
   scoped_refptr<LoginHandler> handler = LoginHandler::Create(
@@ -683,6 +683,6 @@ scoped_refptr<LoginHandler> CreateLoginPrompt(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(&LoginHandler::LoginDialogCallback, url,
                      base::RetainedRef(auth_info), base::RetainedRef(handler),
-                     is_main_frame));
+                     is_request_for_main_frame));
   return handler;
 }

chrome/browser/ui/login/login_handler.h

@@ -146,7 +146,7 @@ class LoginHandler : public content::LoginDelegate,
   friend scoped_refptr<LoginHandler> CreateLoginPrompt(
       net::AuthChallengeInfo* auth_info,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-      bool is_main_frame,
+      bool is_request_for_main_frame,
       const GURL& url,
       LoginAuthRequiredCallback auth_required_callback);
   FRIEND_TEST_ALL_PREFIXES(LoginHandlerTest, DialogStringsAndRealm);

content/browser/loader/resource_dispatcher_host_impl.cc

@@ -548,7 +548,7 @@ scoped_refptr<LoginDelegate> ResourceDispatcherHostImpl::CreateLoginDelegate(
   ResourceRequestInfoImpl* resource_request_info =
       ResourceRequestInfoImpl::ForRequest(request);
   DCHECK(resource_request_info);
-  bool is_main_frame =
+  bool is_request_for_main_frame =
       resource_request_info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME;
   GlobalRequestID request_id = resource_request_info->GetGlobalRequestID();
 
@@ -557,7 +557,8 @@ scoped_refptr<LoginDelegate> ResourceDispatcherHostImpl::CreateLoginDelegate(
   scoped_refptr<LoginDelegate> login_delegate =
       GetContentClient()->browser()->CreateLoginDelegate(
           auth_info, resource_request_info->GetWebContentsGetterForRequest(),
-          is_main_frame, url, resource_request_info->first_auth_attempt(),
+          is_request_for_main_frame, url,
+          resource_request_info->first_auth_attempt(),
           base::BindOnce(&ResourceDispatcherHostImpl::RunAuthRequiredCallback,
                          base::Unretained(this), request_id));
 

content/browser/network_service_client.cc

@@ -161,7 +161,7 @@ class LoginHandlerDelegate {
       network::mojom::AuthChallengeResponderPtr auth_challenge_responder,
       ResourceRequestInfo::WebContentsGetter web_contents_getter,
       scoped_refptr<net::AuthChallengeInfo> auth_info,
-      bool is_main_frame,
+      bool is_request_for_main_frame,
       uint32_t process_id,
       uint32_t routing_id,
       uint32_t request_id,
@@ -169,7 +169,7 @@ class LoginHandlerDelegate {
       bool first_auth_attempt)
       : auth_challenge_responder_(std::move(auth_challenge_responder)),
         auth_info_(auth_info),
-        is_main_frame_(is_main_frame),
+        is_request_for_main_frame_(is_request_for_main_frame),
         url_(url),
         first_auth_attempt_(first_auth_attempt),
         web_contents_getter_(web_contents_getter) {
@@ -226,8 +226,8 @@ class LoginHandlerDelegate {
   void CreateLoginDelegate() {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     login_delegate_ = GetContentClient()->browser()->CreateLoginDelegate(
-        auth_info_.get(), web_contents_getter_, is_main_frame_, url_,
-        first_auth_attempt_,
+        auth_info_.get(), web_contents_getter_, is_request_for_main_frame_,
+        url_, first_auth_attempt_,
         base::BindOnce(&LoginHandlerDelegate::RunAuthCredentials,
                        base::Unretained(this)));
 
@@ -255,7 +255,7 @@ class LoginHandlerDelegate {
 
   network::mojom::AuthChallengeResponderPtr auth_challenge_responder_;
   scoped_refptr<net::AuthChallengeInfo> auth_info_;
-  bool is_main_frame_;
+  bool is_request_for_main_frame_;
   GURL url_;
   bool first_auth_attempt_;
   ResourceRequestInfo::WebContentsGetter web_contents_getter_;
@@ -297,12 +297,13 @@ void NetworkServiceClient::OnAuthRequired(
     return;
   }
 
-  bool is_main_frame =
+  bool is_request_for_main_frame =
       static_cast<ResourceType>(resource_type) == RESOURCE_TYPE_MAIN_FRAME;
-  new LoginHandlerDelegate(
-      std::move(auth_challenge_responder), std::move(web_contents_getter),
-      auth_info, is_main_frame, process_id, routing_id, request_id, url,
-      first_auth_attempt);  // deletes self
+  new LoginHandlerDelegate(std::move(auth_challenge_responder),
+                           std::move(web_contents_getter), auth_info,
+                           is_request_for_main_frame, process_id, routing_id,
+                           request_id, url,
+                           first_auth_attempt);  // deletes self
 }
 
 void NetworkServiceClient::OnCertificateRequested(

content/public/browser/content_browser_client.cc

@@ -700,7 +700,7 @@ ContentBrowserClient::CreateClientCertStore(ResourceContext* resource_context) {
 scoped_refptr<LoginDelegate> ContentBrowserClient::CreateLoginDelegate(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-    bool is_main_frame,
+    bool is_request_for_main_frame,
     const GURL& url,
     bool first_auth_attempt,
     LoginAuthRequiredCallback auth_required_callback) {

content/public/browser/content_browser_client.h

@@ -1162,7 +1162,7 @@ class CONTENT_EXPORT ContentBrowserClient {
   virtual scoped_refptr<LoginDelegate> CreateLoginDelegate(
       net::AuthChallengeInfo* auth_info,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-      bool is_main_frame,
+      bool is_request_for_main_frame,
       const GURL& url,
       bool first_auth_attempt,
       LoginAuthRequiredCallback auth_required_callback);