Revert 54560 - ...

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"
 #include "base/i18n/rtl.h"
 #include "base/file_path.h"
@@ skipping 689 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_,
-                                                 NULL);
+  TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_);
   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(), NULL);
+                                 Extension::LAUNCH_PANEL, GURL());
   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(), NULL);
+                                 Extension::LAUNCH_WINDOW, GURL());
   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_, NULL);
+  Browser::OpenApplicationTab(profile_, extension_app_);
   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(), NULL);
+                                 Extension::LAUNCH_WINDOW, GURL());
   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_,
-                                                 NULL);
+  TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_);
   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(), NULL);
+                                 Extension::LAUNCH_PANEL, GURL());
   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_, NULL);
+  Browser::OpenApplicationTab(profile_, extension_app_);
   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_, NULL);
+  Browser::OpenApplicationTab(profile_, extension_app_);
   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 77 matching lines @@
 
   // 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