Remove deprecated TabContentsDelegate::OpenURLFromTab variant

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 751 matching lines @@
   browser::NavigateParams params(browser, extension_url,
                                  content::PAGE_TRANSITION_START_PAGE);
   params.tabstrip_add_types = add_type;
   params.disposition = disposition;
 
   if (disposition == CURRENT_TAB) {
     TabContents* existing_tab = browser->GetSelectedTabContents();
     TabStripModel* model = browser->tabstrip_model();
     int tab_index = model->GetWrapperIndex(existing_tab);
 
-    existing_tab->OpenURL(extension_url, existing_tab->GetURL(),
-                          disposition, content::PAGE_TRANSITION_LINK);
+    existing_tab->OpenURL(OpenURLParams(
+          extension_url,
+          content::Referrer(existing_tab->GetURL(),
+                            WebKit::WebReferrerPolicyDefault),
+          disposition, content::PAGE_TRANSITION_LINK, false));
     if (params.tabstrip_add_types & TabStripModel::ADD_PINNED) {
       model->SetTabPinned(tab_index, true);
       tab_index = model->GetWrapperIndex(existing_tab);
     }
     if (params.tabstrip_add_types & TabStripModel::ADD_ACTIVE)
       model->ActivateTabAt(tab_index, true);
 
     contents = existing_tab;
   } else {
     browser::Navigate(&params);
@@ skipping 2176 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, PageNavigator implementation:
 
 // TODO(adriansc): Remove this method once refactoring changed all call sites.
 TabContents* Browser::OpenURL(const GURL& url,
                               const GURL& referrer,
                               WindowOpenDisposition disposition,
                               content::PageTransition transition) {
-  return OpenURLFromTab(NULL,
-                        OpenURLParams(url, referrer, disposition, transition,
-                                      false));
+  // For specifying a referrer, use the version of OpenURL taking OpenURLParams.
+  DCHECK(referrer.is_empty());
+  return OpenURLFromTab(NULL, OpenURLParams(
+      url, content::Referrer(), disposition, transition, false));
 }
 
 TabContents* Browser::OpenURL(const OpenURLParams& params) {
   return OpenURLFromTab(NULL, params);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, CommandUpdater::CommandUpdaterDelegate implementation:
 
 void Browser::ExecuteCommand(int id) {
@@ skipping 56 matching lines @@
   browser->LoadingStateChanged(detached_contents->tab_contents());
   return browser;
 }
 
 int Browser::GetDragActions() const {
   return TabStripModelDelegate::TAB_TEAROFF_ACTION | (tab_count() > 1 ?
       TabStripModelDelegate::TAB_MOVE_ACTION : 0);
 }
 
 TabContentsWrapper* Browser::CreateTabContentsForURL(
-    const GURL& url, const GURL& referrer, Profile* profile,
+    const GURL& url, const content::Referrer& referrer, Profile* profile,
     content::PageTransition transition, bool defer_load,
     SiteInstance* instance) const {
   TabContentsWrapper* contents = TabContentsFactory(profile, instance,
       MSG_ROUTING_NONE,
       GetSelectedTabContents(), NULL);
   if (!defer_load) {
     // Load the initial URL before adding the new tab contents to the tab strip
     // so that the tab contents has navigation state.
     contents->controller().LoadURL(url, referrer, transition, std::string());
   }
@@ skipping 307 matching lines @@
   //       still present.
   // NOTE: If you change to be immediate (no invokeLater) then you'll need to
   //       update BrowserList::CloseAllBrowsers.
   MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&Browser::CloseFrame, weak_factory_.GetWeakPtr()));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, TabContentsDelegate implementation:
 
-// TODO(adriansc): Remove this method once refactoring changed all call sites.
-TabContents* Browser::OpenURLFromTab(TabContents* source,
-                                     const GURL& url,
-                                     const GURL& referrer,
-                                     WindowOpenDisposition disposition,
-                                     content::PageTransition transition) {
-  return OpenURLFromTab(source, OpenURLParams(url, referrer, disposition,
-                                              transition, false));
-}
-
 TabContents* Browser::OpenURLFromTab(TabContents* source,
                                      const OpenURLParams& params) {
   browser::NavigateParams nav_params(this, params.url, params.transition);
   nav_params.source_contents =
       tabstrip_model()->GetTabContentsAt(
           tabstrip_model()->GetWrapperIndex(source));
   nav_params.referrer = params.referrer;
   nav_params.disposition = params.disposition;
   nav_params.tabstrip_add_types = TabStripModel::ADD_NONE;
   nav_params.window_action = browser::NavigateParams::SHOW_WINDOW;
@@ skipping 1929 matching lines @@
     window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
   } else {
     GlobalErrorService* service =
         GlobalErrorServiceFactory::GetForProfile(profile());
     GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
     if (error) {
       error->ShowBubbleView(this);
     }
   }
 }