Removal of TabContentsDelegate::GetBrowser() interface method

chrome/browser/browser_browsertest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #if defined(OS_WIN)
 #include "base/i18n/rtl.h"
@@ skipping 186 matching lines @@
 // Test is crashing on Mac, see http://crbug.com/29424.
 #define MAYBE_JavascriptAlertActivatesTab DISABLED_JavascriptAlertActivatesTab
 #else
 #define MAYBE_JavascriptAlertActivatesTab JavascriptAlertActivatesTab
 #endif
 
 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) {
   GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
                                      FilePath(kTitle1File)));
   ui_test_utils::NavigateToURL(browser(), url);
+  Browser* browser_used = NULL;
   browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0,
-                           TabStripModel::ADD_SELECTED, NULL, std::string());
+                           TabStripModel::ADD_SELECTED, NULL, std::string(),
+                           &browser_used);
+  EXPECT_EQ(browser(), browser_used);
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(0, browser()->selected_index());
   TabContents* second_tab = browser()->GetTabContentsAt(1);
   ASSERT_TRUE(second_tab);
   second_tab->render_view_host()->ExecuteJavascriptInWebFrame(L"",
       L"alert('Activate!');");
   AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
   alert->CloseModalDialog();
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->selected_index());
 }
 
 // Create 34 tabs and verify that a lot of processes have been created. The
 // exact number of processes depends on the amount of memory. Previously we
 // had a hard limit of 31 processes and this test is mainly directed at
 // verifying that we don't crash when we pass this limit.
 // Warning: this test can take >30 seconds when running on a slow (low
 // memory?) Mac builder.
 IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) {
   GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
                                      FilePath(kTitle2File)));
 
   // There is one initial tab.
   for (int ix = 0; ix != 33; ++ix) {
+    Browser* browser_used = NULL;
     browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0,
-                             TabStripModel::ADD_SELECTED, NULL, std::string());
+                             TabStripModel::ADD_SELECTED, NULL, std::string(),
+                             &browser_used);
+    EXPECT_EQ(browser(), browser_used);
   }
   EXPECT_EQ(34, browser()->tab_count());
 
   // See browser\renderer_host\render_process_host.cc for the algorithm to
   // decide how many processes to create.
   if (base::SysInfo::AmountOfPhysicalMemoryMB() >= 2048) {
     EXPECT_GE(CountRenderProcessHosts(), 24);
   } else {
     EXPECT_LE(CountRenderProcessHosts(), 23);
   }
@@ skipping 446 matching lines @@
 #endif
 
 // Test that launching an app refocuses a tab already hosting the app.
 IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenTab) {
   SetUpExtensionApp();
 
   ASSERT_EQ(1, browser()->tab_count());
   ASSERT_EQ(NULL, Browser::FindAppTab(browser(), extension_app_));
 
   // Open a tab with the app.
-  TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_);
+  TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_,
+                                                 NULL);
   ASSERT_TRUE(WaitForTab(tab));
   ASSERT_EQ(2, browser()->tab_count());
 
   int app_tab_index = browser()->selected_index();
   ASSERT_EQ(0, app_tab_index) << "App tab should be the left most tab.";
   ASSERT_EQ(browser()->GetTabContentsAt(0),
             Browser::FindAppTab(browser(), extension_app_));
 
   // Open the same app.  The existing tab should stay focused.
   tab = Browser::OpenApplication(profile_, extension_app_->id());
@@ skipping 36 matching lines @@
 
 // Test that launching an app refocuses a panel running the app.
 IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenPanel) {
   SetUpExtensionApp();
 
   ASSERT_EQ(1, browser()->tab_count());
   ASSERT_EQ(NULL, Browser::FindAppWindowOrPanel(profile_, extension_app_));
 
   // Open the app in a panel.
   Browser::OpenApplicationWindow(profile_, extension_app_,
-                                 Extension::LAUNCH_PANEL, GURL());
+                                 Extension::LAUNCH_PANEL, GURL(), NULL);
   Browser* app_panel = BrowserList::GetLastActive();
   ASSERT_TRUE(app_panel);
   ASSERT_NE(app_panel, browser()) << "New browser should have opened.";
   ASSERT_EQ(app_panel, BrowserList::GetLastActive());
   ASSERT_EQ(app_panel,
             Browser::FindAppWindowOrPanel(profile_, extension_app_));
 
   // Focus the initial browser.
   browser()->window()->Show();
   ASSERT_EQ(browser(), BrowserList::GetLastActive());
@@ skipping 12 matching lines @@
 
 // Test that launching an app refocuses a window running the app.
 IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenWindow) {
   SetUpExtensionApp();
 
   ASSERT_EQ(1, browser()->tab_count());
   ASSERT_EQ(NULL, Browser::FindAppWindowOrPanel(profile_, extension_app_));
 
   // Open a window with the app.
   Browser::OpenApplicationWindow(profile_, extension_app_,
-                                 Extension::LAUNCH_WINDOW, GURL());
+                                 Extension::LAUNCH_WINDOW, GURL(), NULL);
   Browser* app_window = BrowserList::GetLastActive();
   ASSERT_TRUE(app_window);
   ASSERT_NE(app_window, browser()) << "New browser should have opened.";
 
   // Focus the initial browser.
   browser()->window()->Show();
   ASSERT_EQ(browser(), BrowserList::GetLastActive());
 
   // Open the app.
   Browser::OpenApplication(profile_, extension_app_->id());
 
   // Focus should move to the window.
   ASSERT_EQ(app_window, BrowserList::GetLastActive());
   ASSERT_EQ(app_window,
             Browser::FindAppWindowOrPanel(profile_, extension_app_));
   // No new tab should have been created in the initial browser.
   ASSERT_EQ(1, browser()->tab_count());
 }
 
 // Test that if an app is opened while running in a window and a tab,
 // the window is focused.
 IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_WindowBeforeTab) {
   SetUpExtensionApp();
 
   ASSERT_EQ(1, browser()->tab_count());
 
   // Open a tab with the app.
-  Browser::OpenApplicationTab(profile_, extension_app_);
+  Browser::OpenApplicationTab(profile_, extension_app_, NULL);
   ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
   ASSERT_EQ(2, browser()->tab_count());
   int app_tab_index = browser()->selected_index();
   ASSERT_EQ(0, app_tab_index) << "App tab should be the left most tab.";
 
   // Open a window with the app.
   Browser::OpenApplicationWindow(profile_, extension_app_,
-                                 Extension::LAUNCH_WINDOW, GURL());
+                                 Extension::LAUNCH_WINDOW, GURL(), NULL);
   Browser* app_window = BrowserList::GetLastActive();
   ASSERT_TRUE(app_window);
   ASSERT_NE(app_window, browser()) << "New browser should have opened.";
 
   // Focus the initial browser.
   browser()->window()->Show();
 
   // Open the app.  Focus should move to the window.
   Browser::OpenApplication(profile_, extension_app_->id());
   ASSERT_EQ(app_window, BrowserList::GetLastActive());
 }
 
 // Test that if an app is opened while running in a panel and a tab,
 // the panel is focused.
 IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_PanelBeforeTab) {
   SetUpExtensionApp();
 
   ASSERT_EQ(1, browser()->tab_count());
 
   // Open a tab with the app.
-  TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_);
+  TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_,
+                                                 NULL);
   ASSERT_TRUE(WaitForTab(tab));
   ASSERT_EQ(2, browser()->tab_count());
   int app_tab_index = browser()->selected_index();
   ASSERT_EQ(0, app_tab_index) << "App tab should be the left most tab.";
 
   // Open a panel with the app.
   Browser::OpenApplicationWindow(profile_, extension_app_,
-                                 Extension::LAUNCH_PANEL, GURL());
+                                 Extension::LAUNCH_PANEL, GURL(), NULL);
   Browser* app_panel = BrowserList::GetLastActive();
   ASSERT_TRUE(app_panel);
   ASSERT_NE(app_panel, browser()) << "New browser should have opened.";
 
   // Focus the initial browser.
   browser()->window()->Show();
 
   // Open the app.  Focus should move to the panel.
   Browser::OpenApplication(profile_, extension_app_->id());
   ASSERT_EQ(app_panel, BrowserList::GetLastActive());
 }
 
 // Test that if multiple tabs host an app, and that app is opened,
 // the tab in the current window gets focus.
 IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_TabInFocusedWindow) {
   SetUpExtensionApp();
 
   ASSERT_EQ(1, browser()->tab_count());
 
-  Browser::OpenApplicationTab(profile_, extension_app_);
+  Browser::OpenApplicationTab(profile_, extension_app_, NULL);
   ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
   ASSERT_EQ(2, browser()->tab_count());
   int app_tab_index = browser()->selected_index();
   ASSERT_EQ(0, app_tab_index) << "App tab should be the left most tab.";
 
   // Open a new browser window, add an app tab.
   Browser* extra_browser = CreateBrowser(profile_);
   ASSERT_EQ(extra_browser, BrowserList::GetLastActive());
 
-  Browser::OpenApplicationTab(profile_, extension_app_);
+  Browser::OpenApplicationTab(profile_, extension_app_, NULL);
   ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(extra_browser));
   ASSERT_EQ(2, extra_browser->tab_count());
   app_tab_index = extra_browser->selected_index();
   ASSERT_EQ(0, app_tab_index) << "App tab should be the left most tab";
 
   // Open the app.  Focus should move to the panel.
   Browser::OpenApplication(profile_, extension_app_->id());
   ASSERT_EQ(extra_browser, BrowserList::GetLastActive());
   ASSERT_EQ(2, extra_browser->tab_count());
 
@@ skipping 27 matching lines @@
 
   // We start with a normal browser with one tab.
   EXPECT_EQ(1, browser()->tab_count());
 
   // Open a popup browser with a single blank foreground tab.
   Browser* popup_browser = browser()->CreateForPopup(browser()->profile());
   popup_browser->AddBlankTab(true);
   EXPECT_EQ(1, popup_browser->tab_count());
 
   // Now try opening another tab in the popup browser.
+  Browser* browser_used = NULL;
   popup_browser->AddTabWithURL(
       GURL(chrome::kAboutBlankURL), GURL(), PageTransition::TYPED, -1,
-      TabStripModel::ADD_SELECTED, NULL, std::string());
+      TabStripModel::ADD_SELECTED, NULL, std::string(), &browser_used);
+  EXPECT_EQ(popup_browser, browser_used);
 
   // The popup should still only have one tab.
   EXPECT_EQ(1, popup_browser->tab_count());
 
   // The normal browser should now have two.
   EXPECT_EQ(2, browser()->tab_count());
 
   // Open an app frame browser with a single blank foreground tab.
   Browser* app_browser =
       browser()->CreateForApp(L"Test", browser()->profile(), false);
   app_browser->AddBlankTab(true);
   EXPECT_EQ(1, app_browser->tab_count());
 
   // Now try opening another tab in the app browser.
   app_browser->AddTabWithURL(
       GURL(chrome::kAboutBlankURL), GURL(), PageTransition::TYPED, -1,
-      TabStripModel::ADD_SELECTED, NULL, std::string());
+      TabStripModel::ADD_SELECTED, NULL, std::string(), &browser_used);
+  EXPECT_EQ(app_browser, browser_used);
 
   // The popup should still only have one tab.
   EXPECT_EQ(1, app_browser->tab_count());
 
   // The normal browser should now have three.
   EXPECT_EQ(3, browser()->tab_count());
 
   // Open an app frame popup browser with a single blank foreground tab.
   Browser* app_popup_browser =
       browser()->CreateForApp(L"Test", browser()->profile(), false);
   app_popup_browser->AddBlankTab(true);
   EXPECT_EQ(1, app_popup_browser->tab_count());
 
   // Now try opening another tab in the app popup browser.
   app_popup_browser->AddTabWithURL(
       GURL(chrome::kAboutBlankURL), GURL(), PageTransition::TYPED, -1,
-      TabStripModel::ADD_SELECTED, NULL, std::string());
+      TabStripModel::ADD_SELECTED, NULL, std::string(), &browser_used);
+  EXPECT_EQ(app_popup_browser, browser_used);
 
   // The popup should still only have one tab.
   EXPECT_EQ(1, app_popup_browser->tab_count());
 
   // The normal browser should now have four.
   EXPECT_EQ(4, browser()->tab_count());
 
   // Close the additional browsers.
   popup_browser->CloseAllTabs();
   app_browser->CloseAllTabs();
   app_popup_browser->CloseAllTabs();
 }
 #endif