Move referrer stripping into GURL::GetAsReferrer().

chrome/browser/renderer_context_menu/render_view_context_menu.cc

Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 28d08ba8177f3bcaccf123d1eccca7c1405c903c..42c0dc4df22ca8f08f8e5dfc558e7ca483cb673b 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1979,24 +1979,14 @@ base::string16 RenderViewContextMenu::PrintableSelectionText() {
 // Controller functions --------------------------------------------------------
 
 void RenderViewContextMenu::OpenURL(
-    const GURL& url, const GURL& referrer, int64 frame_id,
+    const GURL& url, const GURL& referring_url, int64 frame_id,
     WindowOpenDisposition disposition,
     content::PageTransition transition) {
-  // Ensure that URL fragment, username and password fields are not sent
-  // in the referrer.
-  GURL sanitized_referrer(referrer);
-  if (sanitized_referrer.is_valid() && (sanitized_referrer.has_ref() ||
-      sanitized_referrer.has_username() || sanitized_referrer.has_password())) {
-    GURL::Replacements referrer_mods;
-    referrer_mods.ClearRef();
-    referrer_mods.ClearUsername();
-    referrer_mods.ClearPassword();
-    sanitized_referrer = sanitized_referrer.ReplaceComponents(referrer_mods);
-  }
+  content::Referrer referrer(referring_url.GetAsReferrer(),
+      params_.referrer_policy);
 
   WebContents* new_contents = source_web_contents_->OpenURL(OpenURLParams(
-      url, content::Referrer(sanitized_referrer, params_.referrer_policy),
-      disposition, transition, false));
+      url, referrer, disposition, transition, false));
   if (!new_contents)
     return;