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

chrome/browser/ui/intents/web_intent_picker_model_unittest.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 "base/utf_string_conversions.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
@@ skipping 17 matching lines @@
 
 }
 
 class WebIntentPickerModelObserverMock : public WebIntentPickerModelObserver {
  public:
   MOCK_METHOD1(OnModelChanged, void(WebIntentPickerModel* model));
   MOCK_METHOD2(OnFaviconChanged,
                void(WebIntentPickerModel* model, size_t index));
   MOCK_METHOD2(OnExtensionIconChanged,
                void(WebIntentPickerModel* model, const string16& extension_id));
-  MOCK_METHOD1(OnInlineDisposition, void(WebIntentPickerModel* model));
+  MOCK_METHOD2(OnInlineDisposition,
+               void(WebIntentPickerModel* model, const GURL& url));
 };
 
 class WebIntentPickerModelTest : public testing::Test {
  public:
   WebIntentPickerModelTest() {}
 
   virtual void SetUp() {
     testing::Test::SetUp();
     model_.set_observer(&observer_);
   }
@@ skipping 99 matching lines @@
   model_.SetSuggestedExtensionIconWithId(kId2, image);
 
   EXPECT_FALSE(gfx::test::IsEqual(
       image, model_.GetSuggestedExtensionAt(0).icon));
   EXPECT_TRUE(gfx::test::IsEqual(
       image, model_.GetSuggestedExtensionAt(1).icon));
 }
 
 TEST_F(WebIntentPickerModelTest, SetInlineDisposition) {
   EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(3);
-  EXPECT_CALL(observer_, OnInlineDisposition(&model_)).Times(1);
+  EXPECT_CALL(observer_, OnInlineDisposition(&model_, testing::_)).Times(1);
 
   EXPECT_FALSE(model_.IsInlineDisposition());
-  EXPECT_EQ(std::string::npos, model_.inline_disposition_index());
+  EXPECT_EQ(GURL::EmptyGURL(), model_.inline_disposition_url());
 
   model_.AddInstalledService(kTitle1, kUrl1, kWindowDisposition);
   model_.AddInstalledService(kTitle2, kUrl2, kInlineDisposition);
-  model_.SetInlineDisposition(1);
+  model_.SetInlineDisposition(kUrl2);
 
   EXPECT_TRUE(model_.IsInlineDisposition());
-  EXPECT_EQ(1U, model_.inline_disposition_index());
+  EXPECT_EQ(kUrl2, model_.inline_disposition_url());
 
   model_.Clear();
 
   EXPECT_FALSE(model_.IsInlineDisposition());
-  EXPECT_EQ(std::string::npos, model_.inline_disposition_index());
+  EXPECT_EQ(GURL::EmptyGURL(), model_.inline_disposition_url());
 }