Remove AutomationProxy::GetActiveWindow since it's not used anymore after r141895.

BUG=129187
Review URL: https://chromiumcodereview.appspot.com/10545161

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141935 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 2 insertions, 26 deletions

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 9d093f2..c74a6eb 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -370,7 +370,6 @@ bool TestingAutomationProvider::OnMessageReceived(
     IPC_MESSAGE_HANDLER(AutomationMsg_NormalBrowserWindowCount,
                         GetNormalBrowserWindowCount)
     IPC_MESSAGE_HANDLER(AutomationMsg_BrowserWindow, GetBrowserWindow)
-    IPC_MESSAGE_HANDLER(AutomationMsg_ActiveWindow, GetActiveWindow)
     IPC_MESSAGE_HANDLER(AutomationMsg_FindTabbedBrowserWindow,
                         FindTabbedBrowserWindow)
     IPC_MESSAGE_HANDLER(AutomationMsg_WindowExecuteCommandAsync,
@@ -667,15 +666,6 @@ void TestingAutomationProvider::FindTabbedBrowserWindow(int* handle) {
     *handle = browser_tracker_->Add(browser);
 }
 
-void TestingAutomationProvider::GetActiveWindow(int* handle) {
-  *handle = 0;
-  Browser* browser = BrowserList::GetLastActive();
-  if (browser) {
-    gfx::NativeWindow window = browser->window()->GetNativeWindow();
-    *handle = window_tracker_->Add(window);
-  }
-}
-
 void TestingAutomationProvider::ExecuteBrowserCommandAsync(int handle,
                                                            int command,
                                                            bool* success) {
diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h
index dcb77a9..255c6a3 100644
--- a/chrome/browser/automation/testing_automation_provider.h
+++ b/chrome/browser/automation/testing_automation_provider.h
@@ -119,7 +119,6 @@ class TestingAutomationProvider : public AutomationProvider,
   // or in incognito mode.
   void GetBrowserWindow(int index, int* handle);
   void FindTabbedBrowserWindow(int* handle);
-  void GetActiveWindow(int* handle);
   void ExecuteBrowserCommandAsync(int handle, int command, bool* success);
   void ExecuteBrowserCommand(int handle, int command,
                              IPC::Message* reply_message);
@@ -1535,7 +1534,7 @@ class TestingAutomationProvider : public AutomationProvider,
       const string16& frame_xpath, const string16& script,
       IPC::Message* reply_message, content::RenderViewHost* render_view_host);
 
-  // Selects the given |browser| and |tab| if not selected already.
+  // Selects the given |tab| if not selected already.
   void EnsureTabSelected(Browser* browser, content::WebContents* tab);
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h
index a392400..ce767cc 100644
--- a/chrome/common/automation_messages_internal.h
+++ b/chrome/common/automation_messages_internal.h
@@ -230,7 +230,7 @@ IPC_SYNC_MESSAGE_CONTROL1_0(AutomationMsg_OpenNewBrowserWindow,
 
 // This message requests the handle (int64 app-unique identifier) of the
 // current active top window.  On error, the returned handle value is 0.
-IPC_SYNC_MESSAGE_CONTROL0_1(AutomationMsg_ActiveWindow,
+IPC_SYNC_MESSAGE_CONTROL0_1(AutomationMsg_DEPRECATED_ActiveWindow,
                             int)
 
 // This message requests the window associated with the specified browser
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 807b6bb..a86f7ef 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -322,14 +322,6 @@ void AutomationProxy::OnChannelError() {
     Disconnect();
 }
 
-scoped_refptr<WindowProxy> AutomationProxy::GetActiveWindow() {
-  int handle = 0;
-  if (!Send(new AutomationMsg_ActiveWindow(&handle)))
-    return NULL;
-
-  return ProxyObjectFromHandle<WindowProxy>(handle);
-}
-
 scoped_refptr<BrowserProxy> AutomationProxy::GetBrowserWindow(
     int window_index) {
   int handle = 0;
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index 63e9421..80c34ef 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -140,11 +140,6 @@ class AutomationProxy : public IPC::Channel::Listener,
   // On failure, returns NULL.
   scoped_refptr<BrowserProxy> FindTabbedBrowserWindow();
 
-  // Returns the WindowProxy for the currently active window, transferring
-  // ownership of the pointer to the caller.
-  // On failure, returns NULL.
-  scoped_refptr<WindowProxy> GetActiveWindow();
-
   // Sends the browser a new proxy configuration to start using. Returns true
   // if the proxy config was successfully sent, false otherwise.
   bool SendProxyConfig(const std::string& new_proxy_config) WARN_UNUSED_RESULT;