Move referrer stripping into GURL::GetAsReferrer().

chrome/browser/ui/android/context_menu_helper.cc

Index: chrome/browser/ui/android/context_menu_helper.cc
diff --git a/chrome/browser/ui/android/context_menu_helper.cc b/chrome/browser/ui/android/context_menu_helper.cc
index ef9dbe6942fea21d8c9ef9bde48167a56827b0bc..a5db63633d49deb7dfd8f23fb3b30e031a4fab93 100644
--- a/chrome/browser/ui/android/context_menu_helper.cc
+++ b/chrome/browser/ui/android/context_menu_helper.cc
@@ -66,8 +66,8 @@ void ContextMenuHelper::SetPopulator(jobject jpopulator) {
 base::android::ScopedJavaLocalRef<jobject>
 ContextMenuHelper::CreateJavaContextMenuParams(
     const content::ContextMenuParams& params) {
-  GURL sanitizedReferrer = SanitizeReferrer(
-      params.frame_url.is_empty() ? params.page_url : params.frame_url);
+  GURL sanitizedReferrer = (params.frame_url.is_empty() ?
+      params.page_url : params.frame_url).GetAsReferrer();
 
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> jmenu_info =
@@ -95,19 +95,6 @@ ContextMenuHelper::CreateJavaContextMenuParams(
   return jmenu_info;
 }
 
-GURL ContextMenuHelper::SanitizeReferrer(const GURL& referring_url) {
-  // This mirrors sanitization done on Desktop in RenderViewContextMenu.
-  if (referring_url.is_valid() && (referring_url.has_ref() ||
-      referring_url.has_username() || referring_url.has_password())) {
-    GURL::Replacements referrer_mods;
-    referrer_mods.ClearRef();
-    referrer_mods.ClearUsername();
-    referrer_mods.ClearPassword();
-    return referring_url.ReplaceComponents(referrer_mods);
-  }
-  return referring_url;
-}
-
 void ContextMenuHelper::OnCustomItemSelected(JNIEnv* env,
                                              jobject obj,
                                              jint action) {