Index: chrome/browser/browser_browsertest.cc |
=================================================================== |
--- chrome/browser/browser_browsertest.cc (revision 54528) |
+++ chrome/browser/browser_browsertest.cc (working copy) |
@@ -707,7 +707,8 @@ |
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 @@ |
// 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 @@ |
// 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 @@ |
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 @@ |
// 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 @@ |
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 @@ |
// 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 @@ |
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 @@ |
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(); |