Upstream ShouldOverrideUrlLoading changes

android_webview/common/render_view_messages.h

Index: android_webview/common/render_view_messages.h
diff --git a/android_webview/common/render_view_messages.h b/android_webview/common/render_view_messages.h
index 6896d6e609efbcca902c8c565ed70e210ea29b67..ded4fab97ee3716379867e00d908ba86dec9120d 100644
--- a/android_webview/common/render_view_messages.h
+++ b/android_webview/common/render_view_messages.h
@@ -99,3 +99,13 @@ IPC_MESSAGE_ROUTED1(AwViewHostMsg_PageScaleFactorChanged,
 // Sent whenever the contents size (as seen by RenderView) is changed.
 IPC_MESSAGE_ROUTED1(AwViewHostMsg_OnContentsSizeChanged,
                     gfx::Size /* contents_size */)
+
+// Sent when there is a top level navigation. Returning true means

[mkosiba (inactive), 2013/10/17 10:27:45]

The description is a bit vague. Maybe:

"Sent immediately before the main frame (top level) navigation is initiated
within Blink to allow the browser process to cancel that navigation. This is
sent before updating the NavigationController state or creating a URLRequest for
the main frame resource."

[sgurun-gerrit only, 2013/12/06 00:17:48]

Done.

+// the application will handle this request and so will cancel the
+// navigation within Blink. The view id is used to identify the correct
+// WebContents. When a pop up is involved, the view id indicates the
+// id of the opener view and not the opened one.
+IPC_SYNC_MESSAGE_CONTROL2_1(AwViewHostMsg_ShouldOverrideUrlLoading,
+                            int /* view id */,
+                            string16 /* in - url */,
+                            bool /* out - result */)