diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 16:15:37 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 16:15:37 +0000 |
| commit | 7ac5020f506b9ff2a80a1f34de57db4a900fa5c9 (patch) | |
| tree | 0000211ac40d62475a0a05ec2ccde7f1f184f7c8 | |
| parent | 67a32f4888d4f1fb5f7dbf4dbf2ec07edebb7d53 (diff) | |
| download | chromium_src-7ac5020f506b9ff2a80a1f34de57db4a900fa5c9.zip chromium_src-7ac5020f506b9ff2a80a1f34de57db4a900fa5c9.tar.gz chromium_src-7ac5020f506b9ff2a80a1f34de57db4a900fa5c9.tar.bz2 | |
Remove BrowserList::GetLastActive from ui_tests
BUG=129187
Review URL: https://chromiumcodereview.appspot.com/10534128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141895 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 7 | ||||
| -rw-r--r-- | chrome/test/perf/mach_ports_test.cc | 4 | ||||
| -rw-r--r-- | chrome/test/reliability/automated_ui_tests.cc | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 6781126..9d093f2 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -6668,9 +6668,8 @@ void TestingAutomationProvider::OnRemoveProvider() { void TestingAutomationProvider::EnsureTabSelected(Browser* browser, WebContents* tab) { - if (browser->GetActiveWebContents() != tab || - browser != BrowserList::GetLastActive()) { - browser->ActivateTabAt(browser->GetIndexOfController(&tab->GetController()), - true /* user_gesture */); + if (browser->GetActiveWebContents() != tab) { + browser->ActivateTabAt(browser->GetIndexOfController( + &tab->GetController()), true); } } diff --git a/chrome/test/perf/mach_ports_test.cc b/chrome/test/perf/mach_ports_test.cc index d42de35..adb5b05 100644 --- a/chrome/test/perf/mach_ports_test.cc +++ b/chrome/test/perf/mach_ports_test.cc @@ -11,7 +11,6 @@ #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" -#include "chrome/test/automation/window_proxy.h" #include "chrome/test/perf/perf_test.h" #include "chrome/test/ui/ui_perf_test.h" #include "net/test/test_server.h" @@ -73,9 +72,6 @@ TEST_F(MachPortsTest, GetCounts) { RecordPortCount(); // Create a browser and open a few tabs. - scoped_refptr<WindowProxy> window(automation()->GetActiveWindow()); - ASSERT_TRUE(window.get()); - scoped_refptr<BrowserProxy> browser(automation()->FindTabbedBrowserWindow()); ASSERT_TRUE(browser.get()); diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc index 46b23b0..515b017 100644 --- a/chrome/test/reliability/automated_ui_tests.cc +++ b/chrome/test/reliability/automated_ui_tests.cc @@ -680,7 +680,8 @@ bool AutomatedUITest::ForceCrash() { bool AutomatedUITest::SimulateKeyPressInActiveWindow(ui::KeyboardCode key, int flags) { - scoped_refptr<WindowProxy> window(automation()->GetActiveWindow()); + scoped_refptr<BrowserProxy> browser(active_browser()); + scoped_refptr<WindowProxy> window(browser->GetWindow()); if (window.get() == NULL) { AddErrorAttribute("active_window_not_found"); return false; |