Revert 151036 - Speculative revert to see if this change introduced a performance regression on Mac…

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2012 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/automation_provider.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 450 matching lines @@
   g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 bool AutomationProvider::Send(IPC::Message* msg) {
   DCHECK(channel_.get());
   return channel_->Send(msg);
 }
 
 Browser* AutomationProvider::FindAndActivateTab(
     NavigationController* controller) {
-  int tab_index;
-  Browser* browser = browser::FindBrowserForController(controller, &tab_index);
-  if (browser)
-    chrome::ActivateTabAt(browser, tab_index, true);
-  return browser;
+  content::WebContentsDelegate* d = controller->GetWebContents()->GetDelegate();
+  if (d)
+    d->ActivateContents(controller->GetWebContents());
+  return browser::FindBrowserWithWebContents(controller->GetWebContents());
 }
 
 void AutomationProvider::HandleFindRequest(
     int handle,
     const AutomationMsg_Find_Params& params,
     IPC::Message* reply_message) {
   if (!tab_tracker_->ContainsHandle(handle)) {
     AutomationMsg_Find::WriteReplyParams(reply_message, -1, -1);
     Send(reply_message);
     return;
@@ skipping 264 matching lines @@
 
   return NULL;
 }
 
 void AutomationProvider::SaveAsAsync(int tab_handle) {
   NavigationController* tab = NULL;
   WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab);
   if (web_contents)
     web_contents->OnSavePage();
 }