Rename WebIntentData for backend storage to WebIntentServiceData.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index e408ab94db08019f1c4ebac05851ea867ae992b5..ede3390bbd5bbd11bc966fd1f3ca855f58bd0ada 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -152,6 +152,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/window_open_disposition.h"
 
 #if defined(OS_WIN)
@@ -2502,13 +2503,13 @@ void Browser::RegisterIntentHandlerHelper(TabContents* tab,
     service_url = url.Resolve(href);
   }
 
-  WebIntentData intent;
-  intent.service_url = service_url;
-  intent.action = action;
-  intent.type = type;
-  intent.title = title;
+  WebIntentServiceData service;
+  service.service_url = service_url;
+  service.action = action;
+  service.type = type;
+  service.title = title;
   tcw->infobar_tab_helper()->AddInfoBar(
-      new RegisterIntentHandlerInfoBarDelegate(tab, intent));
+      new RegisterIntentHandlerInfoBarDelegate(tab, service));
 }
 
 // static
@@ -3836,9 +3837,7 @@ void Browser::RegisterIntentHandler(TabContents* tab,
 
 void Browser::WebIntentDispatch(TabContents* tab,
                                 int routing_id,
-                                const string16& action,
-                                const string16& type,
-                                const string16& data,
+                                const webkit_glue::WebIntentData& intent,
                                 int intent_id) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
     return;
@@ -3847,7 +3846,7 @@ void Browser::WebIntentDispatch(TabContents* tab,
       TabContentsWrapper::GetCurrentWrapperForContents(tab);
 
   tcw->web_intent_picker_controller()->ShowDialog(window()->GetNativeHandle(),
-                                                  action, type);
+                                                  intent.action, intent.type);
 }
 
 void Browser::FindReply(TabContents* tab,