Remove the usage of GetLastActiveBrowserWindow...

chrome/test/automated_ui_tests/automated_ui_tests.cc

Index: chrome/test/automated_ui_tests/automated_ui_tests.cc
===================================================================
--- chrome/test/automated_ui_tests/automated_ui_tests.cc	(revision 13620)
+++ chrome/test/automated_ui_tests/automated_ui_tests.cc	(working copy)
@@ -340,6 +340,7 @@
     did_complete_action = ShowBookmarkBar();
   } else if (LowerCaseEqualsASCII(action, "setup")) {
     LaunchBrowserAndServer();
+    set_active_browser(automation()->GetBrowserWindow(0));

[Finnur, 2009/04/14 20:22:14]

Do you need a release_active_browser somewhere?

[huanr, 2009/04/14 20:58:26]

set_active_browser() calls active_browser_.reset() so it is released/deleted
either by next set or destructor.

     did_complete_action = true;
   } else if (LowerCaseEqualsASCII(action, "sleep")) {
     // This is for debugging, it probably shouldn't be used real tests.
@@ -417,8 +418,8 @@
 
 bool AutomatedUITest::CloseActiveTab() {
   bool return_value = false;
-  scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow());
-  if (browser.get() == NULL) {
+  BrowserProxy* browser = active_browser();
+  if (browser == NULL) {
     AddErrorAttribute("browser_window_not_found");
     return false;
   }
@@ -478,8 +479,8 @@
 }
 
 bool AutomatedUITest::Navigate() {
-  scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow());
-  if (browser.get() == NULL) {
+  BrowserProxy* browser = active_browser();
+  if (browser == NULL) {
     AddErrorAttribute("browser_window_not_found");
     return false;
   }
@@ -676,8 +677,8 @@
 }
 
 bool AutomatedUITest::ForceCrash() {
-  scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow());
-  if (browser.get() == NULL) {
+  BrowserProxy* browser = active_browser();
+  if (browser == NULL) {
     AddErrorAttribute("browser_window_not_found");
     return false;
   }
@@ -693,19 +694,20 @@
 }
 
 bool AutomatedUITest::DragActiveTab(bool drag_right, bool drag_out) {
-  scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow());
+  BrowserProxy* browser = active_browser();
+  if (browser == NULL) {
+    AddErrorAttribute("browser_window_not_found");
+    return false;
+  }
+
   scoped_ptr<WindowProxy> window(
-      GetAndActivateWindowForBrowser(browser.get()));
+      GetAndActivateWindowForBrowser(browser));
   if (window.get() == NULL) {
     AddErrorAttribute("active_window_not_found");
     return false;
   }
   bool is_timeout;
 
-  if (browser.get() == NULL) {
-    AddErrorAttribute("browser_window_not_found");
-    return false;
-  }
   int tab_count;
   browser->GetTabCountWithTimeout(&tab_count,
                                   action_max_timeout_ms(),