Replace the GURL referrer field of OpenURLParams with a content::Referrer

chrome/browser/bookmarks/bookmark_utils.cc

 // Copyright (c) 2011 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/bookmarks/bookmark_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 59 matching lines @@
   }
 
   Browser* browser() const { return browser_; }
 
   // Deprecated. Please use one-argument variant.
   // TODO(adriansc): Remove this method once refactoring changed all call sites.
   virtual TabContents* OpenURL(const GURL& url,
                                const GURL& referrer,
                                WindowOpenDisposition disposition,
                                content::PageTransition transition) OVERRIDE {
-    return OpenURL(OpenURLParams(url, referrer, disposition, transition,
-                                 false));
+    DCHECK(referrer.is_empty());
+    return OpenURL(OpenURLParams(url, content::Referrer(), disposition,
+                                 transition, false));
   }
 
   virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE {
     if (!browser_) {
       Profile* profile = (params.disposition == OFF_THE_RECORD) ?
           profile_->GetOffTheRecordProfile() : profile_;
       browser_ = Browser::Create(profile);
     }
 
     OpenURLParams forward_params = params;
@@ skipping 56 matching lines @@
                  WindowOpenDisposition initial_disposition,
                  PageNavigator** navigator,
                  Profile* profile,
                  bool* opened_url) {
   if (node->is_url()) {
     WindowOpenDisposition disposition;
     if (*opened_url)
       disposition = NEW_BACKGROUND_TAB;
     else
       disposition = initial_disposition;
-    (*navigator)->OpenURL(OpenURLParams(node->url(), GURL(), disposition,
-                          content::PAGE_TRANSITION_AUTO_BOOKMARK, false));
+    (*navigator)->OpenURL(OpenURLParams(node->url(), content::Referrer(),
+                          disposition, content::PAGE_TRANSITION_AUTO_BOOKMARK,
+                          false));
     if (!*opened_url) {
       *opened_url = true;
       // We opened the first URL which may have opened a new window or clobbered
       // the current page, reset the navigator just to be sure.
       Browser* new_browser = BrowserList::GetLastActiveWithProfile(profile);
       if (new_browser) {
         TabContents* current_tab = new_browser->GetSelectedTabContents();
         DCHECK(new_browser && current_tab);
         if (new_browser && current_tab)
           *navigator = current_tab;
@@ skipping 600 matching lines @@
 void RecordBookmarkLaunch(BookmarkLaunchLocation location) {
 #if defined(OS_WIN)
   // TODO(estade): do this on other platforms too. For now it's compiled out
   // so that stats from platforms for which this is incompletely implemented
   // don't mix in with Windows, where it should be implemented exhaustively.
   UMA_HISTOGRAM_ENUMERATION("Bookmarks.LaunchLocation", location, LAUNCH_LIMIT);
 #endif
 }
 
 }  // namespace bookmark_utils