[Web Intents] WebIntentPickerModel uses URL instead of index to reference registered services.

chrome/browser/ui/cocoa/web_intent_picker_cocoa.mm

 // 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/cocoa/web_intent_picker_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 134 matching lines @@
   // We don't handle individual icon changes - just redo the whole model.
   PerformLayout();
 }
 
 void WebIntentPickerCocoa::OnExtensionIconChanged(
     WebIntentPickerModel* model,
     const string16& extension_id) {
   // TODO(binji): implement.
 }
 
-void WebIntentPickerCocoa::OnInlineDisposition(WebIntentPickerModel* model) {
+void WebIntentPickerCocoa::OnInlineDisposition(WebIntentPickerModel* model,
+                                               const GURL& url) {
   DCHECK(browser_);
-  const WebIntentPickerModel::InstalledService& installed_service =
-      model->GetInstalledServiceAt(model->inline_disposition_index());
-
   content::WebContents* web_contents = content::WebContents::Create(
       browser_->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
   inline_disposition_tab_contents_.reset(new TabContentsWrapper(web_contents));
   inline_disposition_delegate_.reset(new WebIntentInlineDispositionDelegate);
   web_contents->SetDelegate(inline_disposition_delegate_.get());
 
   // Must call this immediately after WebContents creation to avoid race
   // with load.
   delegate_->OnInlineDispositionWebContentsCreated(web_contents);
 
   inline_disposition_tab_contents_->web_contents()->GetController().LoadURL(
-      installed_service.url,
+      url,
       content::Referrer(),
       content::PAGE_TRANSITION_START_PAGE,
       std::string());
 
   [sheet_controller_ setInlineDispositionTabContents:
       inline_disposition_tab_contents_.get()];
   PerformLayout();
 }
 
 void WebIntentPickerCocoa::OnCancelled() {
   DCHECK(delegate_);
   if (!service_invoked)
     delegate_->OnCancelled();
   delegate_->OnClosing();
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void WebIntentPickerCocoa::OnServiceChosen(size_t index) {
   DCHECK(delegate_);
   const WebIntentPickerModel::InstalledService& installed_service =
       model_->GetInstalledServiceAt(index);
   service_invoked = true;
-  delegate_->OnServiceChosen(index, installed_service.disposition);
+  delegate_->OnServiceChosen(installed_service.url,
+                             installed_service.disposition);
 }