Upstream ShouldOverrideUrlLoading changes

android_webview/native/aw_web_contents_delegate.cc

Index: android_webview/native/aw_web_contents_delegate.cc
diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc
index b759c44037927907e4cc23bef3b0f849ee6d75ad..39bb1b0feb3c2c0668a22e85385901e30f36c457 100644
--- a/android_webview/native/aw_web_contents_delegate.cc
+++ b/android_webview/native/aw_web_contents_delegate.cc
@@ -7,6 +7,7 @@
 #include "android_webview/browser/aw_javascript_dialog_manager.h"
 #include "android_webview/browser/find_helper.h"
 #include "android_webview/native/aw_contents.h"
+#include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ -158,6 +159,17 @@ void AwWebContentsDelegate::AddNewContents(WebContents* source,
   }
 }
 
+// Notifies the delegate about the creation of a new WebContents. This
+// typically happens when popups are created.
+void AwWebContentsDelegate::WebContentsCreated(
+    WebContents* source_contents,
+    int64 source_frame_id,
+    const string16& frame_name,
+    const GURL& target_url,
+    content::WebContents* new_contents) {
+  AwContentsIoThreadClientImpl::RegisterPendingContents(new_contents);
+}
+
 void AwWebContentsDelegate::CloseContents(WebContents* source) {
   JNIEnv* env = AttachCurrentThread();