[WebView] Add unique visual state request ids.

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 6c468f6458606260d2c6c41870a541b021727f04..e9cba46c6ee33a2c35d1a89c0ef81a405859176a 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -1037,22 +1037,25 @@ void AwContents::EnableOnNewPicture(JNIEnv* env,
 namespace {
 void FlushVisualStateCallback(const JavaObjectWeakGlobalRef& java_ref,
                               ScopedJavaGlobalRef<jobject>* callback,
+                              int64 request_id,
                               bool result) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref.get(env);
   if (obj.is_null())
      return;
   Java_AwContents_flushVisualStateCallback(
-      env, obj.obj(), callback->obj(), result);
+      env, obj.obj(), callback->obj(), request_id, result);
 }
 }  // namespace
 
-void AwContents::FlushVisualState(JNIEnv* env, jobject obj, jobject callback) {
+void AwContents::FlushVisualState(
+    JNIEnv* env, jobject obj, jobject callback, int64 request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
   j_callback->Reset(env, callback);
   web_contents_->GetMainFrame()->FlushVisualState(base::Bind(
-      &FlushVisualStateCallback, java_ref_, base::Owned(j_callback)));
+      &FlushVisualStateCallback, java_ref_, base::Owned(j_callback),
+      request_id));

[boliu, 2015/02/06 02:05:13]

uber-nit: clang-format this? somehow doesn't look right

[Ignacio Solla, 2015/02/09 11:35:26]

Done.

 }
 
 void AwContents::ClearView(JNIEnv* env, jobject obj) {