Feed back to the ServiceTabLauncher when the tab has been created.

chrome/browser/android/service_tab_launcher.cc

Index: chrome/browser/android/service_tab_launcher.cc
diff --git a/chrome/browser/android/service_tab_launcher.cc b/chrome/browser/android/service_tab_launcher.cc
index f10f223f60d86a5e08908a137e02388485b3e9a7..da4db678f2441b22e7ad3a0ce4eac1e69a4015c0 100644
--- a/chrome/browser/android/service_tab_launcher.cc
+++ b/chrome/browser/android/service_tab_launcher.cc
@@ -8,12 +8,21 @@
 #include "base/callback.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/page_navigator.h"
+#include "content/public/browser/web_contents.h"
 #include "jni/ServiceTabLauncher_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetApplicationContext;
 
+// Called by Java when the WebContents instance for a request Id is available.
+void OnWebContentsForRequestAvailable(
+    JNIEnv* env, jclass clazz, jint request_id, jobject android_web_contents) {
+  chrome::android::ServiceTabLauncher::GetInstance()->OnTabLaunched(
+      request_id,
+      content::WebContents::FromJavaWebContents(android_web_contents));
+}
+
 namespace chrome {
 namespace android {
 
@@ -33,7 +42,7 @@ ServiceTabLauncher::~ServiceTabLauncher() {}
 void ServiceTabLauncher::LaunchTab(
     content::BrowserContext* browser_context,
     const content::OpenURLParams& params,
-    const base::Callback<void(content::WebContents*)>& callback) {
+    const TabLaunchedCallback& callback) {
   if (!java_object_.obj()) {
     LOG(ERROR) << "No ServiceTabLauncher is available to launch a new tab.";
     callback.Run(nullptr);
@@ -58,10 +67,14 @@ void ServiceTabLauncher::LaunchTab(
 
   ScopedJavaLocalRef<jbyteArray> post_data;
 
+  int request_id = tab_launched_callbacks_.Add(
+      new TabLaunchedCallback(callback));
+  DCHECK_GE(request_id, 1);
+
   Java_ServiceTabLauncher_launchTab(env,
                                     java_object_.obj(),
                                     GetApplicationContext(),
-                                    0 /* request_id */,
+                                    request_id,
                                     browser_context->IsOffTheRecord(),
                                     url.obj(),
                                     disposition,
@@ -69,11 +82,17 @@ void ServiceTabLauncher::LaunchTab(
                                     params.referrer.policy,
                                     headers.obj(),
                                     post_data.obj());
+}
+
+void ServiceTabLauncher::OnTabLaunched(int request_id,
+                                       content::WebContents* web_contents) {
+  TabLaunchedCallback* callback = tab_launched_callbacks_.Lookup(request_id);

[Ted C, 2015/02/19 21:55:22]

the one gotcha here is that if the intent is ever redispatched from android
(because it persists it for some reason), it might not exist in the map as it
could have been cleared.

The pending data usage for document mode makes this safer, but the intents do
get slightly out of our control.

Just an FYI that this DCHECK might happen for legitimate reasons in android --
so I'm glad it's a DCHECK :-)

[Peter Beverloo, 2015/02/20 12:09:18]

That's a really good point actually, thank you.

+  DCHECK(callback);
+
+  if (callback)
+    callback->Run(web_contents);
 
-  // TODO(peter): We need to wait for the Android Activity to reply to the
-  // launch intent with the ID of the launched Web Contents, so that the Java
-  // side can invoke a method on the native side with the request id and the
-  // WebContents enabling us to invoke |callback|. See https://crbug.com/454809.
+  tab_launched_callbacks_.Remove(request_id);
 }
 
 bool ServiceTabLauncher::RegisterServiceTabLauncher(JNIEnv* env) {