[pyauto] GetBrowserInfo() should be usable at chromeos login screen

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2011 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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 2219 matching lines @@
   handler_map["GetAppModalDialogMessage"] =
       &TestingAutomationProvider::GetAppModalDialogMessage;
   handler_map["AcceptOrDismissAppModalDialog"] =
       &TestingAutomationProvider::AcceptOrDismissAppModalDialog;
   handler_map["GetChromeDriverAutomationVersion"] =
       &TestingAutomationProvider::GetChromeDriverAutomationVersion;
   handler_map["UpdateExtensionsNow"] =
       &TestingAutomationProvider::UpdateExtensionsNow;
   handler_map["CreateNewAutomationProvider"] =
       &TestingAutomationProvider::CreateNewAutomationProvider;
+  handler_map["GetBrowserInfo"] =
+      &TestingAutomationProvider::GetBrowserInfo;
 #if defined(OS_CHROMEOS)
   handler_map["GetLoginInfo"] = &TestingAutomationProvider::GetLoginInfo;
   handler_map["ShowCreateAccountUI"] =
       &TestingAutomationProvider::ShowCreateAccountUI;
   handler_map["LoginAsGuest"] = &TestingAutomationProvider::LoginAsGuest;
   handler_map["Login"] = &TestingAutomationProvider::Login;
 
   handler_map["LockScreen"] = &TestingAutomationProvider::LockScreen;
   handler_map["UnlockScreen"] = &TestingAutomationProvider::UnlockScreen;
   handler_map["SignoutInScreenLocker"] =
@@ skipping 50 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 
   std::map<std::string, BrowserJsonHandler> browser_handler_map;
   browser_handler_map["DisablePlugin"] =
       &TestingAutomationProvider::DisablePlugin;
   browser_handler_map["EnablePlugin"] =
       &TestingAutomationProvider::EnablePlugin;
   browser_handler_map["GetPluginsInfo"] =
       &TestingAutomationProvider::GetPluginsInfo;
 
-  browser_handler_map["GetBrowserInfo"] =
-      &TestingAutomationProvider::GetBrowserInfo;
-
   browser_handler_map["GetNavigationInfo"] =
       &TestingAutomationProvider::GetNavigationInfo;
 
   browser_handler_map["PerformActionOnInfobar"] =
       &TestingAutomationProvider::PerformActionOnInfobar;
 
   browser_handler_map["GetHistoryInfo"] =
       &TestingAutomationProvider::GetHistoryInfo;
   browser_handler_map["AddHistoryItem"] =
       &TestingAutomationProvider::AddHistoryItem;
@@ skipping 349 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(GetChildProcessHostInfoTask);
 };
 
 }  // namespace
 
 // Sample json input: { "command": "GetBrowserInfo" }
 // Refer to GetBrowserInfo() in chrome/test/pyautolib/pyauto.py for
 // sample json output.
 void TestingAutomationProvider::GetBrowserInfo(
-    Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   base::ThreadRestrictions::ScopedAllowIO allow_io;  // needed for PathService
   DictionaryValue* properties = new DictionaryValue;
   properties->SetString("ChromeVersion", chrome::kChromeVersion);
   properties->SetString("BrowserProcessExecutableName",
                         chrome::kBrowserProcessExecutableName);
   properties->SetString("HelperProcessExecutableName",
                         chrome::kHelperProcessExecutableName);
   properties->SetString("BrowserProcessExecutablePath",
@@ skipping 27 matching lines @@
 
   return_value->SetInteger("browser_pid", base::GetCurrentProcId());
   // Add info about all windows in a list of dictionaries, one dictionary
   // item per window.
   ListValue* windows = new ListValue;
   int windex = 0;
   for (BrowserList::const_iterator it = BrowserList::begin();
        it != BrowserList::end();
        ++it, ++windex) {
     DictionaryValue* browser_item = new DictionaryValue;
-    browser = *it;
+    Browser* browser = *it;

[dtu, 2011/08/25 19:07:45]

Huh, I'm surprised the parameter was never used.

[Nirnimesh, 2011/08/25 19:16:45]

Yes. Calls into question my coding skills.

     browser_item->SetInteger("index", windex);
     // Window properties
     gfx::Rect rect = browser->window()->GetRestoredBounds();
     browser_item->SetInteger("x", rect.x());
     browser_item->SetInteger("y", rect.y());
     browser_item->SetInteger("width", rect.width());
     browser_item->SetInteger("height", rect.height());
     browser_item->SetBoolean("fullscreen",
                              browser->window()->IsFullscreen());
     browser_item->SetInteger("selected_tab", browser->active_index());
@@ skipping 3593 matching lines @@
   IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl);
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }