Remove TabContents from AddBlankTabAt, kill AddBlankTab.

BUG=107201
TEST=no visible change


Review URL: https://chromiumcodereview.appspot.com/11392004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166631 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 38 insertions, 55 deletions

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 8479e64..0227a40 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -1127,10 +1127,10 @@ void TestingAutomationProvider::OpenNewBrowserWindowOfType(
     int type, bool show, IPC::Message* reply_message) {
   new BrowserOpenedNotificationObserver(this, reply_message, false);
   // We may have no current browser windows open so don't rely on
-  // asking an existing browser to execute the IDC_NEWWINDOW command
+  // asking an existing browser to execute the IDC_NEWWINDOW command.
   Browser* browser = new Browser(
       Browser::CreateParams(static_cast<Browser::Type>(type), profile_));
-  chrome::AddBlankTab(browser, true);
+  chrome::AddBlankTabAt(browser, -1, true);
   if (show)
     browser->window()->Show();
 }
@@ -1147,7 +1147,7 @@ void TestingAutomationProvider::OpenNewBrowserWindow(
   new BrowserOpenedNotificationObserver(this, reply_message, true);
   Browser* browser = new Browser(
       Browser::CreateParams(Browser::TYPE_TABBED, profile_));
-  chrome::AddBlankTab(browser, true);
+  chrome::AddBlankTabAt(browser, -1, true);
   if (show)
     browser->window()->Show();
 }
diff --git a/chrome/browser/extensions/extension_install_ui_default.cc b/chrome/browser/extensions/extension_install_ui_default.cc
index 80bdf69..6bc7b5a 100644
--- a/chrome/browser/extensions/extension_install_ui_default.cc
+++ b/chrome/browser/extensions/extension_install_ui_default.cc
@@ -133,7 +133,7 @@ void ExtensionInstallUIDefault::OnInstallSuccess(const Extension* extension,
   Profile* current_profile = profile_->GetOriginalProfile();
   Browser* browser = browser::FindOrCreateTabbedBrowser(current_profile);
   if (browser->tab_count() == 0)
-    chrome::AddBlankTab(browser, true);
+    chrome::AddBlankTabAt(browser, -1, true);
   browser->window()->Show();
 
   bool use_bubble_for_apps = false;
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index a55c778..3299845 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -181,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NoSessionRestoreNewWindowChromeOS) {
   ui_test_utils::NavigateToURL(browser(), url);
 
   Browser* incognito_browser = CreateIncognitoBrowser();
-  chrome::AddBlankTab(incognito_browser, true);
+  chrome::AddBlankTabAt(incognito_browser, -1, true);
   incognito_browser->window()->Show();
 
   // Close the normal browser. After this we only have the incognito window
@@ -374,7 +374,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, IncognitotoNonIncognito) {
 
   // Create a new incognito window.
   Browser* incognito_browser = CreateIncognitoBrowser();
-  chrome::AddBlankTab(incognito_browser, true);
+  chrome::AddBlankTabAt(incognito_browser, -1, true);
   incognito_browser->window()->Show();
 
   // Close the normal browser. After this we only have the incognito window
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 9c93f18..8f54750 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -1479,7 +1479,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) {
   // Open a popup browser with a single blank foreground tab.
   Browser* popup_browser = new Browser(
       Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile()));
-  chrome::AddBlankTab(popup_browser, true);
+  chrome::AddBlankTabAt(popup_browser, -1, true);
   EXPECT_EQ(1, popup_browser->tab_count());
 
   // Now try opening another tab in the popup browser.
@@ -1496,7 +1496,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) {
   // Open an app frame browser with a single blank foreground tab.
   Browser* app_browser = new Browser(Browser::CreateParams::CreateForApp(
       L"Test", browser()->profile(), false));
-  chrome::AddBlankTab(app_browser, true);
+  chrome::AddBlankTabAt(app_browser, -1, true);
   EXPECT_EQ(1, app_browser->tab_count());
 
   // Now try opening another tab in the app browser.
@@ -1514,7 +1514,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) {
   // Open an app frame popup browser with a single blank foreground tab.
   Browser* app_popup_browser = new Browser(Browser::CreateParams::CreateForApp(
       L"Test", browser()->profile(), false));
-  chrome::AddBlankTab(app_popup_browser, true);
+  chrome::AddBlankTabAt(app_popup_browser, -1, true);
   EXPECT_EQ(1, app_popup_browser->tab_count());
 
   // Now try opening another tab in the app popup browser.
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index e46af6e..d5f3744 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -308,7 +308,7 @@ void NewEmptyWindow(Profile* profile) {
 Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
   Browser* browser = new Browser(
       Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));
-  AddBlankTab(browser, true);
+  AddBlankTabAt(browser, -1, true);
   browser->window()->Show();
   return browser;
 }
@@ -473,15 +473,15 @@ void NewTab(Browser* browser) {
                             TabStripModel::NEW_TAB_ENUM_COUNT);
 
   if (browser->is_type_tabbed()) {
-    AddBlankTab(browser, true);
+    AddBlankTabAt(browser, -1, true);
     GetActiveWebContents(browser)->GetView()->RestoreFocus();
   } else {
     Browser* b =
         browser::FindOrCreateTabbedBrowser(browser->profile(),
                                            browser->host_desktop_type());
-    AddBlankTab(b, true);
+    AddBlankTabAt(b, -1, true);
     b->window()->Show();
-    // The call to AddBlankTab above did not set the focus to the tab as its
+    // The call to AddBlankTabAt above did not set the focus to the tab as its
     // window was not active, so we have to do it explicitly.
     // See http://crbug.com/6380.
     GetActiveWebContents(b)->GetView()->RestoreFocus();
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index 4992058..1a4fb90 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -274,7 +274,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_BrowsersRememberFocus) {
   // Open a new browser window.
   Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile()));
   ASSERT_TRUE(browser2);
-  chrome::AddBlankTab(browser2, true);
+  chrome::AddBlankTabAt(browser2, -1, true);
   browser2->window()->Show();
   ui_test_utils::NavigateToURL(browser2, url);
 
@@ -428,7 +428,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest,
   // Open a new browser window.
   Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile()));
   ASSERT_TRUE(browser2);
-  chrome::AddBlankTab(browser2, true);
+  chrome::AddBlankTabAt(browser2, -1, true);
   browser2->window()->Show();
 
   Browser* focused_browser = NULL;
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
index 3b0510d..8cd4af5 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -82,7 +82,7 @@ chrome::NavigateParams BrowserNavigatorTest::MakeNavigateParams(
 Browser* BrowserNavigatorTest::CreateEmptyBrowserForType(Browser::Type type,
                                                          Profile* profile) {
   Browser* browser = new Browser(Browser::CreateParams(type, profile));
-  chrome::AddBlankTab(browser, true);
+  chrome::AddBlankTabAt(browser, -1, true);
   return browser;
 }
 
@@ -91,7 +91,7 @@ Browser* BrowserNavigatorTest::CreateEmptyBrowserForApp(Browser::Type type,
   Browser* browser = new Browser(
       Browser::CreateParams::CreateForApp(
           Browser::TYPE_POPUP, "Test", gfx::Rect(), profile));
-  chrome::AddBlankTab(browser, true);
+  chrome::AddBlankTabAt(browser, -1, true);
   return browser;
 }
 
diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.cc b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
index 5544f80..4847fbb 100644
--- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc
+++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
@@ -40,13 +40,8 @@ BrowserTabStripModelDelegate::~BrowserTabStripModelDelegate() {
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripModelDelegate, TabStripModelDelegate implementation:
 
-TabContents* BrowserTabStripModelDelegate::AddBlankTab(bool foreground) {
-  return chrome::AddBlankTab(browser_, foreground);
-}
-
-TabContents* BrowserTabStripModelDelegate::AddBlankTabAt(int index,
-                                                         bool foreground) {
-  return chrome::AddBlankTabAt(browser_, index, foreground);
+void BrowserTabStripModelDelegate::AddBlankTabAt(int index, bool foreground) {
+  chrome::AddBlankTabAt(browser_, index, foreground);
 }
 
 Browser* BrowserTabStripModelDelegate::CreateNewStripWithContents(
diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.h b/chrome/browser/ui/browser_tab_strip_model_delegate.h
index 85344cbe..8703a80 100644
--- a/chrome/browser/ui/browser_tab_strip_model_delegate.h
+++ b/chrome/browser/ui/browser_tab_strip_model_delegate.h
@@ -32,8 +32,7 @@ class BrowserTabStripModelDelegate : public TabStripModelDelegate {
 
  private:
   // Overridden from TabStripModelDelegate:
-  virtual TabContents* AddBlankTab(bool foreground) OVERRIDE;
-  virtual TabContents* AddBlankTabAt(int index, bool foreground) OVERRIDE;
+  virtual void AddBlankTabAt(int index, bool foreground) OVERRIDE;
   virtual Browser* CreateNewStripWithContents(
       const std::vector<NewStripContents>& contentses,
       const gfx::Rect& window_bounds,
diff --git a/chrome/browser/ui/browser_tabstrip.cc b/chrome/browser/ui/browser_tabstrip.cc
index e820050..d060db9 100644
--- a/chrome/browser/ui/browser_tabstrip.cc
+++ b/chrome/browser/ui/browser_tabstrip.cc
@@ -55,11 +55,7 @@ void ActivateTabAt(Browser* browser, int index, bool user_gesture) {
   browser->tab_strip_model()->ActivateTabAt(index, user_gesture);
 }
 
-TabContents* AddBlankTab(Browser* browser, bool foreground) {
-  return AddBlankTabAt(browser, -1, foreground);
-}
-
-TabContents* AddBlankTabAt(Browser* browser, int index, bool foreground) {
+void AddBlankTabAt(Browser* browser, int index, bool foreground) {
   // Time new tab page creation time.  We keep track of the timing data in
   // WebContents, but we want to include the time it takes to create the
   // WebContents object too.
@@ -71,7 +67,6 @@ TabContents* AddBlankTabAt(Browser* browser, int index, bool foreground) {
   chrome::Navigate(&params);
   params.target_contents->web_contents()->SetNewTabStartTime(
       new_tab_start_time);
-  return params.target_contents;
 }
 
 bool IsTabStripEditable(Browser* browser) {
diff --git a/chrome/browser/ui/browser_tabstrip.h b/chrome/browser/ui/browser_tabstrip.h
index f4c6177..f44d7b8 100644
--- a/chrome/browser/ui/browser_tabstrip.h
+++ b/chrome/browser/ui/browser_tabstrip.h
@@ -35,8 +35,9 @@ content::WebContents* GetWebContentsAt(const Browser* browser, int index);
 
 void ActivateTabAt(Browser* browser, int index, bool user_gesture);
 
-TabContents* AddBlankTab(Browser* browser, bool foreground);
-TabContents* AddBlankTabAt(Browser* browser, int index, bool foreground);
+// Adds a blank tab to the tab strip of the specified browser; an |index| of -1
+// means to append it to the end of the tab strip.
+void AddBlankTabAt(Browser* browser, int index, bool foreground);
 
 // Used by extensions.
 bool IsTabStripEditable(Browser* browser);
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 3d561c2..5b5c21a 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -614,7 +614,7 @@ private:
   content::RecordAction(UserMetricsAction("NewTab_Button"));
   UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", TabStripModel::NEW_TAB_BUTTON,
                             TabStripModel::NEW_TAB_ENUM_COUNT);
-  tabStripModel_->delegate()->AddBlankTab(true);
+  tabStripModel_->delegate()->AddBlankTabAt(-1, true);
 }
 
 // (Private) Returns the number of open tabs in the tab strip. This is the
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index 23c9fbd..8aba20b 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -1141,7 +1141,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PreferPreviousSearch) {
   // For some reason we can't use AddSelectedTabWithURL here on ChromeOS. It
   // could be some delicate assumption about the tab starting off unselected or
   // something relating to user gesture.
-  chrome::AddBlankTab(browser(), true);
+  chrome::AddBlankTabAt(browser(), -1, true);
   ui_test_utils::NavigateToURL(browser(), url);
   WebContents* web_contents_2 = chrome::GetActiveWebContents(browser());
   EXPECT_NE(web_contents_1, web_contents_2);
@@ -1264,7 +1264,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulatePreserveLast) {
       FindBarController::kKeepResultsInFindBox);
 
   // Now create a second tab and load the same page.
-  chrome::AddBlankTab(browser(), true);
+  chrome::AddBlankTabAt(browser(), -1, true);
   ui_test_utils::NavigateToURL(browser(), url);
   WebContents* web_contents_2 = chrome::GetActiveWebContents(browser());
   EXPECT_NE(web_contents_1, web_contents_2);
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index 52742ce..1c5628f 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -2189,7 +2189,7 @@ void TabStripGtk::OnNewTabClicked(GtkWidget* widget) {
       content::RecordAction(UserMetricsAction("NewTab_Button"));
       UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", TabStripModel::NEW_TAB_BUTTON,
                                 TabStripModel::NEW_TAB_ENUM_COUNT);
-      model_->delegate()->AddBlankTab(true);
+      model_->delegate()->AddBlankTabAt(-1, true);
       break;
     case 2: {
       // On middle-click, try to parse the PRIMARY selection as a URL and load
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 32025fb..215fa59 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -868,7 +868,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(Browser* browser,
   if (!chrome::GetActiveWebContents(browser)) {
     // TODO: this is a work around for 110909. Figure out why it's needed.
     if (!browser->tab_count())
-      chrome::AddBlankTab(browser, true);
+      chrome::AddBlankTabAt(browser, -1, true);
     else
       chrome::ActivateTabAt(browser, 0, false);
   }
diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
index 22cef25..fe8002f 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.h
+++ b/chrome/browser/ui/tabs/tab_strip_model.h
@@ -414,7 +414,8 @@ class TabStripModel : public content::NotificationObserver {
   // Adds a TabContents at the best position in the TabStripModel given
   // the specified insertion index, transition, etc. |add_types| is a bitmask of
   // AddTabTypes; see it for details. This method ends up calling into
-  // InsertTabContentsAt to do the actual insertion.
+  // InsertTabContentsAt to do the actual insertion. Pass -1 for |index| to
+  // append the contents to the end of the tab strip.
   void AddTabContents(TabContents* contents,
                       int index,
                       content::PageTransition transition,
diff --git a/chrome/browser/ui/tabs/tab_strip_model_delegate.h b/chrome/browser/ui/tabs/tab_strip_model_delegate.h
index 8b82bfb..e9cb6fd 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_delegate.h
+++ b/chrome/browser/ui/tabs/tab_strip_model_delegate.h
@@ -46,9 +46,9 @@ class TabStripModelDelegate {
 
   virtual ~TabStripModelDelegate() {}
 
-  // Adds what the delegate considers to be a blank tab to the model.
-  virtual TabContents* AddBlankTab(bool foreground) = 0;
-  virtual TabContents* AddBlankTabAt(int index, bool foreground) = 0;
+  // Adds what the delegate considers to be a blank tab to the model. An |index|
+  // value of -1 means to append the contents to the end of the tab strip.
+  virtual void AddBlankTabAt(int index, bool foreground) = 0;
 
   // Asks for a new TabStripModel to be created and the given web contentses to
   // be added to it. Its size and position are reflected in |window_bounds|.
diff --git a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc
index c506b92..5d389ca 100644
--- a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc
+++ b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc
@@ -17,13 +17,7 @@ TestTabStripModelDelegate::TestTabStripModelDelegate() {
 TestTabStripModelDelegate::~TestTabStripModelDelegate() {
 }
 
-TabContents* TestTabStripModelDelegate::AddBlankTab(bool foreground) {
-  return NULL;
-}
-
-TabContents* TestTabStripModelDelegate::AddBlankTabAt(int index,
-                                                      bool foreground) {
-  return NULL;
+void TestTabStripModelDelegate::AddBlankTabAt(int index, bool foreground) {
 }
 
 Browser* TestTabStripModelDelegate::CreateNewStripWithContents(
diff --git a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.h b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.h
index c290ed1..0962098 100644
--- a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.h
+++ b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.h
@@ -16,9 +16,7 @@ class TestTabStripModelDelegate : public TabStripModelDelegate {
   virtual ~TestTabStripModelDelegate();
 
   // Overridden from TabStripModelDelegate:
-  virtual TabContents* AddBlankTab(bool foreground) OVERRIDE;
-  virtual TabContents* AddBlankTabAt(int index,
-                                     bool foreground) OVERRIDE;
+  virtual void AddBlankTabAt(int index, bool foreground) OVERRIDE;
   virtual Browser* CreateNewStripWithContents(
       const std::vector<NewStripContents>& contentses,
       const gfx::Rect& window_bounds,
diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc
index 8ca8535..15e1b15 100644
--- a/chrome/browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc
+++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc
@@ -65,7 +65,7 @@ class AppNonClientFrameViewAshTest : public InProcessBrowserTest {
     params.initial_show_state = ui::SHOW_STATE_MAXIMIZED;
     params.app_type = Browser::APP_TYPE_HOST;
     app_browser_ = new Browser(params);
-    chrome::AddBlankTab(app_browser_, true);
+    chrome::AddBlankTabAt(app_browser_, -1, true);
     app_browser_->window()->Show();
   }
 
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 21c31e9..4909f8b 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -342,7 +342,7 @@ bool BrowserTabStripController::IsCompatibleWith(TabStrip* other) const {
 }
 
 void BrowserTabStripController::CreateNewTab() {
-  model_->delegate()->AddBlankTab(true);
+  model_->delegate()->AddBlankTabAt(-1, true);
 }
 
 void BrowserTabStripController::ClickActiveTab(int index) {