Change removing method, GetBrowser from TabContentsDelegate, as this was breaking an abstraction layer. This routine was originally added in CL 434046, which required the Browser* to construct extension popup views from within Chrome-Frame instances.

I changed all accesses to Browser instances from usage of the above method, to either iterating the BrowserList using the situation-specific profile as a search key, or modifying the appropriate delegate interfaces to provide the functionality that was previously used directly via the Browser.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/2941001

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

1 files changed, 11 insertions, 9 deletions

diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 528c9e4..68a29d3 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -707,7 +707,8 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenTab) {
   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());
 
@@ -764,7 +765,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenPanel) {
 
   // 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.";
@@ -797,7 +798,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenWindow) {
 
   // 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.";
@@ -825,7 +826,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_WindowBeforeTab) {
   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();
@@ -833,7 +834,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_WindowBeforeTab) {
 
   // 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.";
@@ -854,7 +855,8 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_PanelBeforeTab) {
   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();
@@ -862,7 +864,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_PanelBeforeTab) {
 
   // 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.";
@@ -882,7 +884,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_TabInFocusedWindow) {
 
   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();
@@ -892,7 +894,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_TabInFocusedWindow) {
   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();