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

chrome/browser/ui/cocoa/web_intent_sheet_controller_unittest.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 "base/basictypes.h"
 #include "base/message_loop.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/web_intent_sheet_controller.h"
 #include "chrome/browser/ui/cocoa/web_intent_picker_cocoa.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace {
 
 class MockIntentPickerDelegate : public WebIntentPickerDelegate {
  public:
   virtual ~MockIntentPickerDelegate() {}
 
-  MOCK_METHOD2(OnServiceChosen, void(size_t index, Disposition disposition));
+  MOCK_METHOD2(OnServiceChosen, void(const GURL& url, Disposition disposition));
   MOCK_METHOD1(OnInlineDispositionWebContentsCreated,
       void(content::WebContents* web_contents));
   MOCK_METHOD0(OnCancelled, void());
   MOCK_METHOD0(OnClosing, void());
 };
 
 }  // namespace
 
 class WebIntentPickerSheetControllerTest
     : public TabContentsWrapperTestHarness {
@@ skipping 125 matching lines @@
 
   EXPECT_CALL(delegate_, OnCancelled());
   EXPECT_CALL(delegate_, OnClosing());
   picker_->Close();
 
   ignore_result(picker_.release());  // Closing |picker_| will destruct it.
 }
 
 TEST_F(WebIntentPickerSheetControllerTest, DontCancelAfterServiceInvokation) {
   CreateBubble();
-  model_.AddInstalledService(string16(), GURL(),
+  GURL url;
+  model_.AddInstalledService(string16(), url,
       WebIntentPickerModel::DISPOSITION_WINDOW);
 
   EXPECT_CALL(delegate_, OnServiceChosen(
-      0, WebIntentPickerModel::DISPOSITION_WINDOW));
+      url, WebIntentPickerModel::DISPOSITION_WINDOW));
   EXPECT_CALL(delegate_, OnCancelled()).Times(0);
   EXPECT_CALL(delegate_, OnClosing());
 
   picker_->OnServiceChosen(0);
   picker_->Close();
 
   ignore_result(picker_.release());  // Closing |picker_| will destruct it.
 }