Fix flakiness by removing GetLastActive from extension browser tests.

chrome/browser/extensions/extension_browsertests_misc.cc

 // Copyright (c) 2012 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 "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 631 matching lines @@
   ExtensionProcessManager* manager =
       browser()->profile()->GetExtensionProcessManager();
   ExtensionHost* host = FindHostWithPath(manager, "/bg.html", 1);
 
   bool result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", L"testLastError()", &result));
   EXPECT_TRUE(result);
 }
 
-// Helper function for common code shared by the 3 WindowOpen tests below.
-static void WindowOpenHelper(Browser* browser, const GURL& start_url,
-                             const std::string& newtab_url,
-                             WebContents** newtab_result) {
-  ui_test_utils::NavigateToURL(browser, start_url);
-
-  ui_test_utils::WindowedNotificationObserver observer(
-      content::NOTIFICATION_LOAD_STOP,
-      content::NotificationService::AllSources());
-  ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
-      browser->GetSelectedWebContents()->GetRenderViewHost(), L"",
-      L"window.open('" + UTF8ToWide(newtab_url) + L"');"));
-
-  // Now the active tab in last active window should be the new tab.
-  Browser* last_active_browser = BrowserList::GetLastActive();
-  EXPECT_TRUE(last_active_browser);
-  WebContents* newtab = last_active_browser->GetSelectedWebContents();
-  EXPECT_TRUE(newtab);
-  GURL expected_url = start_url.Resolve(newtab_url);
-  observer.Wait();
-  EXPECT_EQ(expected_url,
-            newtab->GetController().GetLastCommittedEntry()->GetURL());
-  if (newtab_result)
-    *newtab_result = newtab;
-}
-
 // Tests that an extension page can call window.open to an extension URL and
 // the new window has extension privileges.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("uitest").AppendASCII("window_open")));
 
+  GURL start_url(std::string("chrome-extension://") +
+      last_loaded_extension_id_ + "/test.html");
+  ui_test_utils::NavigateToURL(browser(), start_url);
   WebContents* newtab;
-  ASSERT_NO_FATAL_FAILURE(WindowOpenHelper(
-      browser(),
-      GURL(std::string("chrome-extension://") + last_loaded_extension_id_ +
-           "/test.html"),
-      "newtab.html", &newtab));
+  ASSERT_NO_FATAL_FAILURE(OpenWindow(browser()->GetSelectedWebContents(),
+                          start_url.Resolve("newtab.html"), true, &newtab));
 
   bool result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       newtab->GetRenderViewHost(), L"", L"testExtensionApi()", &result));
   EXPECT_TRUE(result);
 }
 
 // Tests that if an extension page calls window.open to an invalid extension
 // URL, the browser doesn't crash.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenInvalidExtension) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("uitest").AppendASCII("window_open")));
 
-  ASSERT_NO_FATAL_FAILURE(WindowOpenHelper(
-      browser(),
-      GURL(std::string("chrome-extension://") + last_loaded_extension_id_ +
-           "/test.html"),
-      "chrome-extension://thisissurelynotavalidextensionid/newtab.html", NULL));
+  GURL start_url(std::string("chrome-extension://") +
+      last_loaded_extension_id_ + "/test.html");
+  ui_test_utils::NavigateToURL(browser(), start_url);
+  ASSERT_NO_FATAL_FAILURE(OpenWindow(browser()->GetSelectedWebContents(),
+      GURL("chrome-extension://thisissurelynotavalidextensionid/newtab.html"),
+      false, NULL));
 
   // If we got to this point, we didn't crash, so we're good.
 }
 
 // Tests that calling window.open from the newtab page to an extension URL
 // gives the new window extension privileges - even though the opening page
 // does not have extension privileges, we break the script connection, so
 // there is no privilege leak.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("uitest").AppendASCII("window_open")));
 
+  ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
   WebContents* newtab;
-  ASSERT_NO_FATAL_FAILURE(WindowOpenHelper(
-      browser(),
-      GURL("about:blank"),
-      std::string("chrome-extension://") + last_loaded_extension_id_ +
-          "/newtab.html",
-      &newtab));
+  ASSERT_NO_FATAL_FAILURE(OpenWindow(browser()->GetSelectedWebContents(),
+      GURL(std::string("chrome-extension://") + last_loaded_extension_id_ +
+          "/newtab.html"), false, &newtab));
 
   // Extension API should succeed.
   bool result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       newtab->GetRenderViewHost(), L"", L"testExtensionApi()", &result));
   EXPECT_TRUE(result);
 }
 
 #if defined(OS_WIN) && defined(NDEBUG)
 #define MAYBE_PluginLoadUnload PluginLoadUnload
@@ skipping 140 matching lines @@
 
   EXPECT_EQ(extension->GetResourceURL("options.html"),
             tab_strip->GetTabContentsAt(1)->web_contents()->GetURL());
 }
 
 //==============================================================================
 // STOP! Please do not add any more random-ass tests here. Create new files for
 // your tests grouped by functionality. Also, you should strongly consider using
 // ExtensionAPITest if possible.
 //==============================================================================