Revert 56834 - Fix a few test failures when landing http://trac.webkit.org/ch...

chrome/browser/extensions/extension_browsertests_misc.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 "base/file_util.h"
 #include "base/ref_counted.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 596 matching lines @@
                                     const std::string& newtab_url) {
   ui_test_utils::NavigateToURL(browser, start_url);
 
   bool result = false;
   ui_test_utils::ExecuteJavaScriptAndExtractBool(
       browser->GetSelectedTabContents()->render_view_host(), L"",
       L"window.open('" + UTF8ToWide(newtab_url) + L"');"
       L"window.domAutomationController.send(true);", &result);
   EXPECT_TRUE(result);
 
-  // Now the active tab in last active window should be the new tab.
-  Browser* last_active_browser = BrowserList::GetLastActive();
-  EXPECT_TRUE(last_active_browser);
-  TabContents* newtab = last_active_browser->GetSelectedTabContents();
-  EXPECT_TRUE(newtab);
+  // Now the current tab should be the new tab.
+  TabContents* newtab = browser->GetSelectedTabContents();
   GURL expected_url = start_url.Resolve(newtab_url);
   if (!newtab->controller().GetLastCommittedEntry() ||
       newtab->controller().GetLastCommittedEntry()->url() != expected_url)
     ui_test_utils::WaitForNavigation(&newtab->controller());
   EXPECT_EQ(expected_url, newtab->controller().GetLastCommittedEntry()->url());
 
   return newtab;
 }
 
 // Tests that an extension page can call window.open to an extension URL and
@@ skipping 143 matching lines @@
 
   // If the options page hasn't already come up, wait for it.
   if (tab_strip->count() == 1) {
     ui_test_utils::WaitForNewTab(browser());
   }
   ASSERT_EQ(2, tab_strip->count());
 
   EXPECT_EQ(extension->GetResourceURL("options.html"),
             tab_strip->GetTabContentsAt(1)->GetURL());
 }