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

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.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 <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
@@ skipping 108 matching lines @@
   virtual void OnFaviconChanged(
       WebIntentPickerModel* model, size_t index) OVERRIDE {
     num_icons_changed_++;
   }
 
   virtual void OnExtensionIconChanged(
       WebIntentPickerModel* model, const string16& extension_id) OVERRIDE {
     num_extension_icons_changed_++;
   }
 
-  virtual void OnInlineDisposition(WebIntentPickerModel* model) OVERRIDE {}
+  virtual void OnInlineDisposition(
+      WebIntentPickerModel* model, const GURL& url) OVERRIDE {}
   virtual void Close() OVERRIDE {}
 
   virtual void OnPendingAsyncCompleted() OVERRIDE {
     pending_async_completed_ = true;
 
     if (message_loop_started_)
       MessageLoop::current()->Quit();
   }
 
   void WaitForPendingAsync() {
@@ skipping 93 matching lines @@
 
     fake_url_fetcher_factory_->SetFakeResponse(icon_url, icon_response_,
         true);
   }
 
   void OnSendReturnMessage(
     webkit_glue::WebIntentReplyType reply_type) {
     controller_->OnSendReturnMessage(reply_type);
   }
 
-  void OnServiceChosen(size_t index, Disposition disposition) {
-    controller_->OnServiceChosen(index, disposition);
+  void OnServiceChosen(const GURL& url, Disposition disposition) {
+    controller_->OnServiceChosen(url, disposition);
   }
 
   void OnCancelled() {
     controller_->OnCancelled();
   }
 
   void CreateFakeIcon() {
     gfx::Image image(gfx::test::CreateImage());
     std::vector<unsigned char> image_data;
     bool result = gfx::PNGEncodedDataFromImage(image, &image_data);
@@ skipping 21 matching lines @@
   picker_.WaitForPendingAsync();
   EXPECT_EQ(2, picker_.num_installed_services_);
   EXPECT_EQ(0, picker_.num_icons_changed_);
 
   webkit_glue::WebIntentData intent;
   intent.action = ASCIIToUTF16("a");
   intent.type = ASCIIToUTF16("b");
   IntentsDispatcherMock dispatcher(intent);
   controller_->SetIntentsDispatcher(&dispatcher);
 
-  OnServiceChosen(1, WebIntentPickerModel::DISPOSITION_WINDOW);
+  OnServiceChosen(kServiceURL2, WebIntentPickerModel::DISPOSITION_WINDOW);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL2),
             browser()->GetSelectedWebContents()->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 
   OnSendReturnMessage(webkit_glue::WEB_INTENT_REPLY_SUCCESS);
   ASSERT_EQ(1, browser()->tab_count());
 }
 
@@ skipping 40 matching lines @@
   controller_->ShowDialog(browser(), kAction1, kType);
   picker_.WaitForPendingAsync();
   EXPECT_EQ(1, picker_.num_installed_services_);
 
   webkit_glue::WebIntentData intent;
   intent.action = ASCIIToUTF16("a");
   intent.type = ASCIIToUTF16("b");
   IntentsDispatcherMock dispatcher(intent);
   controller_->SetIntentsDispatcher(&dispatcher);
 
-  OnServiceChosen(0, WebIntentPickerModel::DISPOSITION_WINDOW);
+  OnServiceChosen(kServiceURL1, WebIntentPickerModel::DISPOSITION_WINDOW);
   ASSERT_EQ(3, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
             browser()->GetSelectedWebContents()->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 
   OnSendReturnMessage(webkit_glue::WEB_INTENT_REPLY_SUCCESS);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(original, browser()->GetSelectedWebContents()->GetURL());
 }