Remove CRWWebController.referrerFromNavigationAction.

This CL removes CRWWebController.referrerFromNavigationAction which is
not a very helpful method. The HTTP header constant "Referer" is moved
into wk_navigation_util.h/mm for possible reuse.

Bug: 956511
Change-Id: I8036c773c2dabde04282e93b34d97e89940ca191
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1599588
Commit-Queue: Yi Su <mrsuyi@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658991}

ios/web/navigation/wk_navigation_util.h

@@ -18,6 +18,7 @@
 #ifndef IOS_WEB_NAVIGATION_WK_NAVIGATION_UTIL_H_
 #define IOS_WEB_NAVIGATION_WK_NAVIGATION_UTIL_H_
 
+#import <Foundation/Foundation.h>
 #include <memory>
 #include <vector>
 
@@ -39,6 +40,9 @@ extern const char kRestoreSessionSessionHashPrefix[];
 // URL fragment prefix used to encode target URL in a restore_session.html URL.
 extern const char kRestoreSessionTargetUrlHashPrefix[];
 
+// The "Referer" [sic] HTTP header.
+extern NSString* const kReferrerHeaderName;
+
 // Returns true if |url| is a placeholder URL or restore_session.html URL.
 bool IsWKInternalUrl(const GURL& url);
 

ios/web/navigation/wk_navigation_util.mm

@@ -32,6 +32,7 @@ const int kMaxSessionSize = 75;
 const char kRestoreSessionSessionHashPrefix[] = "session=";
 const char kRestoreSessionTargetUrlHashPrefix[] = "targetUrl=";
 const char kOriginalUrlKey[] = "for";
+NSString* const kReferrerHeaderName = @"Referer";
 
 namespace {
 // Returns begin and end iterators and an updated last committed index for the

ios/web/web_state/ui/crw_web_controller.mm

@@ -136,6 +136,8 @@ using web::wk_navigation_util::CreatePlaceholderUrlForUrl;
 using web::wk_navigation_util::ExtractUrlFromPlaceholderUrl;
 using web::wk_navigation_util::IsRestoreSessionUrl;
 using web::wk_navigation_util::IsWKInternalUrl;
+using web::wk_navigation_util::kReferrerHeaderName;
+using web::wk_navigation_util::URLNeedsUserAgentType;
 
 namespace {
 
@@ -163,8 +165,6 @@ NSString* const kFrameBecameAvailableMessageName = @"FrameBecameAvailable";
 // Message command sent when a frame is unloading.
 NSString* const kFrameBecameUnavailableMessageName = @"FrameBecameUnavailable";
 
-NSString* const kReferrerHeaderName = @"Referer";  // [sic]
-
 // The duration of the period following a screen touch during which the user is
 // still considered to be interacting with the page.
 const NSTimeInterval kMaximumDelayForUserInteractionInSeconds = 2;
@@ -410,9 +410,6 @@ bool RequiresContentFilterBlockingWorkaround() {
 // unless the request was a POST.
 @property(weak, nonatomic, readonly) NSDictionary* currentHTTPHeaders;
 
-// Extracts "Referer" [sic] value from WKNavigationAction request header.
-- (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action;
-
 // Returns the current URL of the web view, and sets |trustLevel| accordingly
 // based on the confidence in the verification.
 - (GURL)webURLWithTrustLevel:(web::URLVerificationTrustLevel*)trustLevel;
@@ -1273,7 +1270,7 @@ typedef void (^ViewportStateCompletion)(const web::PageViewportState*);
   item->SetURL(URL);
   navigationContext->SetMimeType(MIMEType);
   if (item->GetUserAgentType() == web::UserAgentType::NONE &&
-      web::wk_navigation_util::URLNeedsUserAgentType(URL)) {
+      URLNeedsUserAgentType(URL)) {
     item->SetUserAgentType(web::UserAgentType::MOBILE);
   }
 
@@ -3862,7 +3859,8 @@ typedef void (^ViewportStateCompletion)(const web::PageViewportState*);
     return nil;
   }
 
-  NSString* referrer = [self referrerFromNavigationAction:action];
+  NSString* referrer =
+      [action.request valueForHTTPHeaderField:kReferrerHeaderName];
   GURL openerURL =
       referrer.length ? GURL(base::SysNSStringToUTF8(referrer)) : _documentURL;
 
@@ -4432,7 +4430,7 @@ typedef void (^ViewportStateCompletion)(const web::PageViewportState*);
       // performing characters escaping).
       web::NavigationItem* item =
           web::GetItemWithUniqueID(self.navigationManagerImpl, context);
-      if (!web::wk_navigation_util::IsWKInternalUrl(webViewURL)) {
+      if (!IsWKInternalUrl(webViewURL)) {
         if (item) {
           item->SetURL(webViewURL);
         }
@@ -5453,7 +5451,7 @@ typedef void (^ViewportStateCompletion)(const web::PageViewportState*);
     self.navigationHandler.pendingNavigationInfo =
         [[CRWPendingNavigationInfo alloc] init];
     self.navigationHandler.pendingNavigationInfo.referrer =
-        [self referrerFromNavigationAction:action];
+        [action.request valueForHTTPHeaderField:kReferrerHeaderName];
     self.navigationHandler.pendingNavigationInfo.navigationType =
         action.navigationType;
     self.navigationHandler.pendingNavigationInfo.HTTPMethod =
@@ -5556,7 +5554,7 @@ typedef void (^ViewportStateCompletion)(const web::PageViewportState*);
   // navigation. WKWebView allows multiple provisional navigations, while
   // Navigation Manager has only one pending navigation.
   if (item) {
-    if (!web::wk_navigation_util::IsWKInternalUrl(URL)) {
+    if (!IsWKInternalUrl(URL)) {
       item->SetVirtualURL(URL);
       item->SetURL(URL);
     }
@@ -6098,8 +6096,4 @@ typedef void (^ViewportStateCompletion)(const web::PageViewportState*);
   _containerView = nil;
 }
 
-- (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action {
-  return [action.request valueForHTTPHeaderField:kReferrerHeaderName];
-}
-
 @end