Remove the usage of GetLastActiveBrowserWindow...

chrome/test/automated_ui_tests/automated_ui_tests.cc

 // Copyright (c) 2006-2008 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 <fstream>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 322 matching lines @@
   } else if (LowerCaseEqualsASCII(action, "restoretab")) {
     did_complete_action = RestoreTab();
   } else if (LowerCaseEqualsASCII(action, "selectnexttab")) {
     did_complete_action = SelectNextTab();
   } else if (LowerCaseEqualsASCII(action, "selectprevtab")) {
     did_complete_action = SelectPreviousTab();
   } else if (LowerCaseEqualsASCII(action, "showbookmarks")) {
     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.
     Sleep(kDebuggingTimeoutMsec);
     did_complete_action = true;
   } else if (LowerCaseEqualsASCII(action, "star")) {
     did_complete_action = StarPage();
   } else if (LowerCaseEqualsASCII(action, "taskmanager")) {
     did_complete_action = OpenTaskManagerDialog();
   } else if (LowerCaseEqualsASCII(action, "teardown")) {
@@ skipping 57 matching lines @@
   int index = base::RandInt(0, len);
   while ((*encodings)[index].encoding_id == 0) {
     index = base::RandInt(0, len);
   }
 
   return RunCommandAsync((*encodings)[index].encoding_id);
 }
 
 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;
   }
   int browser_windows_count;
   int tab_count;
   bool is_timeout;
   browser->GetTabCountWithTimeout(&tab_count,
                                   action_max_timeout_ms(),
                                   &is_timeout);
   automation()->GetBrowserWindowCount(&browser_windows_count);
@@ skipping 39 matching lines @@
 
 bool AutomatedUITest::JavaScriptConsole() {
   return RunCommandAsync(IDC_JS_CONSOLE);
 }
 
 bool AutomatedUITest::JavaScriptDebugger() {
   return RunCommandAsync(IDC_DEBUGGER);
 }
 
 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;
   }
   bool did_timeout;
   scoped_ptr<TabProxy> tab(
       browser->GetActiveTabWithTimeout(action_max_timeout_ms(), &did_timeout));
   // TODO(devint): This might be masking a bug. I can't think of many
   // valid cases where we would get a browser window, but not be able
   // to return an active tab. Yet this has happened and has triggered crashes.
   // Investigate this.
@@ skipping 176 matching lines @@
                                          - 1);
     return_value = return_value &&
                    DoAction(kTestDialogPossibleActions[action_index]);
     if (DidCrash(false))
       break;
   }
   return DoAction("PressEscapeKey") && return_value;
 }
 
 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;
   }
   scoped_ptr<TabProxy> tab(browser->GetActiveTab());
   GURL test_url("about:crash");
   bool did_timeout;
   tab->NavigateToURLWithTimeout(test_url, kDebuggingTimeoutMsec, &did_timeout);
   if (!did_timeout) {
     AddInfoAttribute("expected_crash");
     return false;
   }
   return true;
 }
 
 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(),
                                   &is_timeout);
   // As far as we're concerned, if we can't get a view for a tab, it doesn't
   // exist, so cap tab_count at the number of tab view ids there are.
   tab_count = std::min(tab_count, VIEW_ID_TAB_LAST - VIEW_ID_TAB_0);
 
   int tab_index;
   if (!browser->GetActiveTabIndexWithTimeout(&tab_index,
@@ skipping 236 matching lines @@
   }
 }
 
 TEST_F(AutomatedUITest, TheOneAndOnlyTest) {
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(kReproSwitch))
     RunReproduction();
   else
     RunAutomatedUITest();
 }