Add "scheme" field to WebIntentServiceData object.

webkit/glue/web_intent_service_data.h

Index: webkit/glue/web_intent_service_data.h
diff --git a/webkit/glue/web_intent_service_data.h b/webkit/glue/web_intent_service_data.h
index d5a9136dd8efaf58902be91895e07d0efddd0a51..40785410d774b885659517a21fe4d3314b8a1870 100644
--- a/webkit/glue/web_intent_service_data.h
+++ b/webkit/glue/web_intent_service_data.h
@@ -27,9 +27,10 @@ struct WEBKIT_GLUE_EXPORT WebIntentServiceData {
   };
 
   WebIntentServiceData();
-  WebIntentServiceData(const GURL& service_url,
-                       const string16& action,
+  WebIntentServiceData(const string16& action,
                        const string16& type,
+                       const string16& scheme,
+                       const GURL& service_url,
                        const string16& title);
   explicit WebIntentServiceData(const WebKit::WebIntentServiceInfo& info);
   ~WebIntentServiceData();
@@ -38,11 +39,23 @@ struct WEBKIT_GLUE_EXPORT WebIntentServiceData {
 
   void setDisposition(const string16& disp);
 
-  GURL service_url;  // URL for service invocation.
+  // |action|+|type| forms one type of unique service key. The other is
+  // |scheme|.
   string16 action;  // Name of action provided by service.
   string16 type;  // MIME type of data accepted by service.
+
+  // |scheme| forms one type of unique service key. The other is
+  // |action|+|type|. Note that this scheme is for purposes
+  // of matching intent services, not the scheme associated
+  // with the service_url.
+  string16 scheme;  // Protocol scheme for intent service matching.
+
+  GURL service_url;  // URL for service invocation.
   string16 title;  // The title of the service.
-  Disposition disposition;  // The context the service is opened in.
+
+  // Disposition specifies the way in which a service is surfaced to the user.
+  // Current supported dispositions are declared in the |Disposition| enum.
+  Disposition disposition;
 };
 
 // Printing operator - helps gtest produce readable error messages.