Move referrer stripping into GURL::GetAsReferrer().

chrome/browser/ui/android/context_menu_helper.cc

 // Copyright 2013 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 "chrome/browser/ui/android/context_menu_helper.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/android/download_controller_android.h"
@@ skipping 48 matching lines @@
 }
 
 void ContextMenuHelper::SetPopulator(jobject jpopulator) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ContextMenuHelper_setPopulator(env, java_obj_.obj(), 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 =
       ContextMenuParamsAndroid::Java_ContextMenuParams_create(
           env,
           params.media_type,
           ConvertUTF8ToJavaString(env, params.link_url.spec()).obj(),
           ConvertUTF16ToJavaString(env, params.link_text).obj(),
           ConvertUTF8ToJavaString(env, params.unfiltered_link_url.spec()).obj(),
           ConvertUTF8ToJavaString(env, params.src_url.spec()).obj(),
           ConvertUTF16ToJavaString(env, params.selection_text).obj(),
           params.is_editable,
           ConvertUTF8ToJavaString(env, sanitizedReferrer.spec()).obj(),
           params.referrer_policy);
 
   std::vector<content::MenuItem>::const_iterator i;
   for (i = params.custom_items.begin(); i != params.custom_items.end(); ++i) {
     ContextMenuParamsAndroid::Java_ContextMenuParams_addCustomItem(
         env,
         jmenu_info.obj(),
         ConvertUTF16ToJavaString(env, i->label).obj(),
         i->action);
   }
 
   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) {
   if (!context_menu_callback_.is_null()) {
     context_menu_callback_.Run(action);
     context_menu_callback_.Reset();
   }
 }
 
 void ContextMenuHelper::OnStartDownload(JNIEnv* env,
                                         jobject obj,
                                         jboolean jis_link) {
   content::DownloadControllerAndroid::Get()->StartContextMenuDownload(
       context_menu_params_,
       web_contents_,
       jis_link);
 }
 
 bool RegisterContextMenuHelper(JNIEnv* env) {
   return RegisterNativesImpl(env) &&
          ContextMenuParamsAndroid::RegisterNativesImpl(env);
 }