Reverting 9388 to see if this fixes ui tests.

TBR=tommi
Review URL: http://codereview.chromium.org/20179

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

2 files changed, 22 insertions, 37 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index b6f8462..dc1cb10 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -770,8 +770,6 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) {
                         SetAcceleratorsForTab)
     IPC_MESSAGE_HANDLER(AutomationMsg_ProcessUnhandledAccelerator,
                         ProcessUnhandledAccelerator)
-    IPC_MESSAGE_HANDLER(AutomationMsg_SetInitialFocus,
-                        SetInitialFocus)
     IPC_MESSAGE_HANDLER(AutomationMsg_WaitForTabToBeRestored,
                         WaitForTabToBeRestored)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetSecurityState,
@@ -2107,10 +2105,18 @@ void AutomationProvider::SetAcceleratorsForTab(const IPC::Message& message,
                                                HACCEL accel_table,
                                                int accel_entry_count) {
   bool status = false;
-  ExternalTabContainer* external_tab = GetExternalTabForHandle(handle);
-  if (external_tab) {
-    external_tab->SetAccelerators(accel_table, accel_entry_count);
-    status = true;
+  if (tab_tracker_->ContainsHandle(handle)) {
+    NavigationController* tab = tab_tracker_->GetResource(handle);
+    TabContents* tab_contents = tab->GetTabContents(TAB_CONTENTS_WEB);
+    ExternalTabContainer* external_tab_container =
+        ExternalTabContainer::GetContainerForTab(
+            tab_contents->GetContainerHWND());
+    // This call is only valid on an externally hosted tab
+    if (external_tab_container) {
+      external_tab_container->SetAccelerators(accel_table,
+                                              accel_entry_count);
+      status = true;
+    }
   }
   Send(new AutomationMsg_SetAcceleratorsForTabResponse(message.routing_id(),
                                                        status));
@@ -2118,18 +2124,16 @@ void AutomationProvider::SetAcceleratorsForTab(const IPC::Message& message,
 
 void AutomationProvider::ProcessUnhandledAccelerator(
     const IPC::Message& message, int handle, const MSG& msg) {
-  ExternalTabContainer* external_tab = GetExternalTabForHandle(handle);
-  if (external_tab) {
-    external_tab->ProcessUnhandledAccelerator(msg);
-  }
-  // This message expects no response.
-}
-
-void AutomationProvider::SetInitialFocus(const IPC::Message& message,
-                                           int handle, bool reverse) {
-  ExternalTabContainer* external_tab = GetExternalTabForHandle(handle);
-  if (external_tab) {
-    external_tab->SetInitialFocus(reverse);
+  if (tab_tracker_->ContainsHandle(handle)) {
+    NavigationController* tab = tab_tracker_->GetResource(handle);
+    TabContents* tab_contents = tab->GetTabContents(TAB_CONTENTS_WEB);
+    ExternalTabContainer* external_tab_container =
+        ExternalTabContainer::GetContainerForTab(
+            tab_contents->GetContainerHWND());
+    // This call is only valid on an externally hosted tab
+    if (external_tab_container) {
+      external_tab_container->ProcessUnhandledAccelerator(msg);
+    }
   }
   // This message expects no response.
 }
@@ -2387,20 +2391,6 @@ WebContents* AutomationProvider::GetWebContentsForHandle(
   return web_contents;
 }
 
-ExternalTabContainer* AutomationProvider::GetExternalTabForHandle(int handle) {
-  if (tab_tracker_->ContainsHandle(handle)) {
-    NavigationController* tab = tab_tracker_->GetResource(handle);
-    TabContents* tab_contents = tab->GetTabContents(TAB_CONTENTS_WEB);
-    DCHECK(tab_contents);
-    if (tab_contents) {
-      HWND hwnd = tab_contents->GetContainerHWND();
-      return ExternalTabContainer::GetContainerForTab(hwnd);
-    }
-  }
-
-  return NULL;
-}
-
 TestingAutomationProvider::TestingAutomationProvider(Profile* profile)
     : AutomationProvider(profile) {
   BrowserList::AddObserver(this);
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index a8ca47f..c223d3d 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -30,7 +30,6 @@
 
 class LoginHandler;
 class NavigationControllerRestoredObserver;
-class ExternalTabContainer;
 
 class AutomationProvider : public base::RefCounted<AutomationProvider>,
                            public IPC::Channel::Listener,
@@ -249,8 +248,6 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
   void ProcessUnhandledAccelerator(const IPC::Message& message, int handle,
                                    const MSG& msg);
 
-  void SetInitialFocus(const IPC::Message& message, int handle, bool reverse);
-
   // See comment in AutomationMsg_WaitForTabToBeRestored.
   void WaitForTabToBeRestored(const IPC::Message& message, int tab_handle);
 
@@ -373,8 +370,6 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
   // is not of the WebContents type.
   WebContents* GetWebContentsForHandle(int handle, NavigationController** tab);
 
-  ExternalTabContainer* GetExternalTabForHandle(int handle);
-
   // Callback for history redirect queries.
   virtual void OnRedirectQueryComplete(
       HistoryService::Handle request_handle,