Move referrer stripping into GURL::GetAsReferrer().

chrome/browser/renderer_context_menu/render_view_context_menu.cc

 // Copyright 2014 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/renderer_context_menu/render_view_context_menu.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 1961 matching lines @@
 }
 
 base::string16 RenderViewContextMenu::PrintableSelectionText() {
   return gfx::TruncateString(params_.selection_text,
                             kMaxSelectionTextLength);
 }
 
 // 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;
 
   RetargetingDetails details;
   details.source_web_contents = source_web_contents_;
   details.source_frame_id = frame_id;
   details.target_url = url;
   details.target_web_contents = new_contents;
   details.not_yet_in_tabstrip = false;
   content::NotificationService::current()->Notify(
@@ skipping 35 matching lines @@
   source_web_contents_->GetRenderViewHost()->
       ExecuteMediaPlayerActionAtLocation(location, action);
 }
 
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecutePluginActionAtLocation(location, action);
 }