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

chrome/browser/ui/intents/web_intent_picker_controller.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/ui/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 287 matching lines @@
 
   switch (disposition) {
     case WebIntentPickerModel::DISPOSITION_INLINE:
       // Set the model to inline disposition. It will notify the picker which
       // will respond (via OnInlineDispositionWebContentsCreated) with the
       // WebContents to dispatch the intent to.
       picker_model_->SetInlineDisposition(url);
       break;
 
     case WebIntentPickerModel::DISPOSITION_WINDOW: {
-      int index = TabStripModel::kNoTab;
-      Browser* browser = browser::FindBrowserForController(
-          &tab_contents_->web_contents()->GetController(), &index);
+      Browser* browser = browser::FindBrowserWithWebContents(
+          tab_contents_->web_contents());
       TabContents* contents = chrome::TabContentsFactory(
           tab_contents_->profile(),
           tab_util::GetSiteInstanceForNewTab(
               tab_contents_->profile(), url),
           MSG_ROUTING_NONE, NULL);
 
       // Let the controller for the target TabContents know that it is hosting a
       // web intents service.
       contents->web_intent_picker_controller()->SetWindowDispositionSource(
           tab_contents_->web_contents(), intents_dispatcher_);
@@ skipping 140 matching lines @@
   picker_->OnExtensionInstallFailure(id);
   AsyncOperationFinished();
 }
 
 void WebIntentPickerController::OnSendReturnMessage(
     webkit_glue::WebIntentReplyType reply_type) {
   ClosePicker();
 
   if (service_tab_ &&
       reply_type != webkit_glue::WEB_INTENT_SERVICE_CONTENTS_CLOSED) {
-    int index = TabStripModel::kNoTab;
-    Browser* browser = browser::FindBrowserForController(
-        &service_tab_->GetController(), &index);
+    Browser* browser = browser::FindBrowserWithWebContents(service_tab_);
     if (browser) {
+      int index = browser->tab_strip_model()->GetIndexOfWebContents(
+          service_tab_);
       browser->tab_strip_model()->CloseTabContentsAt(
           index, TabStripModel::CLOSE_CREATE_HISTORICAL_TAB);
 
       // Activate source tab.
       Browser* source_browser =
           browser::FindBrowserWithWebContents(tab_contents_->web_contents());
       if (source_browser) {
         int source_index = source_browser->tab_strip_model()->
             GetIndexOfTabContents(tab_contents_);
         chrome::ActivateTabAt(source_browser, source_index, false);
@@ skipping 282 matching lines @@
   // If picker is non-NULL, it was set by a test.
   if (picker_ == NULL)
     picker_ = WebIntentPicker::Create(tab_contents_, this, picker_model_.get());
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   if (picker_)
     picker_->Close();
 }