Add "scheme" field to WebIntentServiceData object.

chrome/browser/intents/web_intents_registry_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/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 306 matching lines @@
   registry_.GetIntentServices(ASCIIToUTF16("http://webintents.org/share"),
                               ASCIIToUTF16("*"),
                               base::Bind(&TestConsumer::OnIntentsQueryDone,
                                          base::Unretained(&consumer)));
   consumer.WaitForData();
   ASSERT_EQ(1U, consumer.services_.size());
 }
 
 TEST_F(WebIntentsRegistryTest, GetIntentsWithMimeAndLiteralMatching) {
   WebIntentServiceData services[] = {
-    WebIntentServiceData(GURL("http://elsewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("image/*"),
+                         string16(),
+                         GURL("http://elsewhere.com/intent/share.html"),
                          ASCIIToUTF16("Image Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("image/jpeg"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Specific Image Editing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("text/uri-list"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Link Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere2.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("text/plain"),
+                         string16(),
+                         GURL("http://somewhere2.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://elsewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("elsewhere"),
+                         string16(),
+                         GURL("http://elsewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("somewhere"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("nota/*"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("*nomime"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("*/nomime"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("*/*nomime"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("*/*/nomime"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("nomime/*"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("x-type/*"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("x-/*"),  // actually a string literal
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Text Sharing Service"))
   };
   registry_.RegisterIntentService(services[0]);
   registry_.RegisterIntentService(services[1]);
   registry_.RegisterIntentService(services[2]);
   registry_.RegisterIntentService(services[3]);
   registry_.RegisterIntentService(services[4]);
   registry_.RegisterIntentService(services[5]);
   registry_.RegisterIntentService(services[6]);
   registry_.RegisterIntentService(services[7]);
@@ skipping 162 matching lines @@
 
   EXPECT_EQ("", consumer.default_.service_url);
 }
 
 // Verify that collapsing equivalent intents works properly.
 TEST_F(WebIntentsRegistryTest, CollapseIntents) {
   WebIntentsRegistry::IntentServiceList services;
 
   // Add two intents with identical |service_url|, |title|, and |action|.
   services.push_back(
-      WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-      ASCIIToUTF16("http://webintents.org/share"),
+      WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
       ASCIIToUTF16("image/png"),
+      string16(),
+      GURL("http://somewhere.com/intent/share.html"),
       ASCIIToUTF16("Image Sharing Service")));
   services.push_back(
-      WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-      ASCIIToUTF16("http://webintents.org/share"),
+      WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
       ASCIIToUTF16("image/jpg"),
+      string16(),
+      GURL("http://somewhere.com/intent/share.html"),
       ASCIIToUTF16("Image Sharing Service")));
   // Service that differs in disposition.
   services.push_back(
-      WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-      ASCIIToUTF16("http://webintents.org/share"),
+      WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
       ASCIIToUTF16("image/png"),
+      string16(),
+      GURL("http://somewhere.com/intent/share.html"),
       ASCIIToUTF16("Image Sharing Service")));
   ASSERT_EQ(WebIntentServiceData::DISPOSITION_WINDOW,
       services.back().disposition);
   services.back().disposition = WebIntentServiceData::DISPOSITION_INLINE;
   // Service that differs in title.
   services.push_back(
-      WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-      ASCIIToUTF16("http://webintents.org/share"),
+      WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
       ASCIIToUTF16("image/png"),
+      string16(),
+      GURL("http://somewhere.com/intent/share.html"),
       ASCIIToUTF16("Sharing Service")));
   // Service that differs in |action|.
   services.push_back(
-      WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-      ASCIIToUTF16("http://webintents.org/share-old"),
+      WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share-old"),
       ASCIIToUTF16("image/png"),
+      string16(),
+      GURL("http://somewhere.com/intent/share.html"),
       ASCIIToUTF16("Image Sharing Service")));
   // Service that differs in |service_url|.
   services.push_back(
-      WebIntentServiceData(GURL("http://zoo.com/share.html"),
-      ASCIIToUTF16("http://webintents.org/share"),
+      WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
       ASCIIToUTF16("image/png"),
+      string16(),
+      GURL("http://zoo.com/share.html"),
       ASCIIToUTF16("Image Sharing Service")));
 
   // Only the first two services should be collapsed.
   registry_.CollapseIntents(&services);
   ASSERT_EQ(5UL, services.size());
 
   // Joined services have their mime types combined
   EXPECT_EQ(ASCIIToUTF16("image/png,image/jpg"), services[0].type);
 
   // Verify the remaining services via distinguishing characteristics.
   EXPECT_EQ(WebIntentServiceData::DISPOSITION_INLINE, services[1].disposition);
   EXPECT_EQ(ASCIIToUTF16("Sharing Service"), services[2].title);
   EXPECT_EQ(ASCIIToUTF16("http://webintents.org/share-old"),
       services[3].action);
   EXPECT_EQ(GURL("http://zoo.com/share.html").spec(),
       services[4].service_url.spec());
 }
 
 // Verify that GetIntentServices collapses equivalent intents.
 TEST_F(WebIntentsRegistryTest, GetIntentsCollapsesEquivalentIntents) {
   WebIntentServiceData services[] = {
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                         ASCIIToUTF16("http://webintents.org/share"),
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
                          ASCIIToUTF16("image/png"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
                          ASCIIToUTF16("Image Sharing Service")),
-    WebIntentServiceData(GURL("http://somewhere.com/intent/share.html"),
-                        ASCIIToUTF16("http://webintents.org/share"),
-                        ASCIIToUTF16("image/jpg"),
-                        ASCIIToUTF16("Image Sharing Service"))
+    WebIntentServiceData(ASCIIToUTF16("http://webintents.org/share"),
+                         ASCIIToUTF16("image/jpg"),
+                         string16(),
+                         GURL("http://somewhere.com/intent/share.html"),
+                         ASCIIToUTF16("Image Sharing Service"))
   };
   registry_.RegisterIntentService(services[0]);
   registry_.RegisterIntentService(services[1]);
 
   TestConsumer consumer;
   registry_.GetIntentServices(ASCIIToUTF16("http://webintents.org/share"),
                               ASCIIToUTF16("image/*"),
                               base::Bind(&TestConsumer::OnIntentsQueryDone,
                                          base::Unretained(&consumer)));
 
   consumer.WaitForData();
   ASSERT_EQ(1U, consumer.services_.size());
   EXPECT_EQ(ASCIIToUTF16("image/png,image/jpg"), consumer.services_[0].type);
 }