Update chromium code to use WebIntentRequest.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8d5d6e5fa2c21753d05914b8b696e06ae7b9593b..1fd8afdb014ecf0ed548bc1018099d4f883a5bf8 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -103,6 +103,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntent.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentServiceInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
@@ -3160,11 +3161,13 @@ void RenderViewImpl::registerIntentService(
                                                 service.disposition()));
 }
 
-void RenderViewImpl::dispatchIntent(WebKit::WebFrame* frame,
-                                    const WebKit::WebIntent& intent) {
-  webkit_glue::WebIntentData intent_data(intent);
+void RenderViewImpl::dispatchIntent(
+    WebKit::WebFrame* frame, const WebKit::WebIntentRequest& intentRequest) {

[darin (slow to review), 2012/01/19 07:23:57]

nit: no need for WebKit:: prefix in front of WebFrame.  please add a using
directive for WebIntentRequest at the top of this file for consistency and drop
the WebKit:: prefix.

[Greg Billock, 2012/01/19 18:51:59]

Done.

+  WebKit::WebIntentRequest request(intentRequest);

[darin (slow to review), 2012/01/19 07:23:57]

this temporary variable should be unnecessary.

[Greg Billock, 2012/01/19 18:51:59]

Done.

+  webkit_glue::WebIntentData intent_data(request.intent());
+  int id = intents_host_->RegisterWebIntent(request);
   Send(new IntentsHostMsg_WebIntentDispatch(
-      routing_id_, intent_data, intent.identifier()));
+      routing_id_, intent_data, id));
 }
 
 // WebKit::WebPageSerializerClient implementation ------------------------------