Minor correctness fix to dialog handler

IDMap::Remove will check if the id is invalid, so short-circuit the
entire method if lookup fails.

NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/19385004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213013 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 4 deletions

diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index c044197..7b84c26 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -161,12 +161,15 @@ void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::JavaScriptDialogManager::DialogClosedCallback* callback =
       pending_js_dialog_callbacks_.Lookup(id);
+  if (!callback) {
+    LOG(WARNING) << "Unexpected JS dialog confirm. " << id;
+    return;
+  }
   string16 prompt_text;
   if (prompt) {
     prompt_text = ConvertJavaStringToUTF16(env, prompt);
   }
-  if (callback)
-    callback->Run(true, prompt_text);
+  callback->Run(true, prompt_text);
   pending_js_dialog_callbacks_.Remove(id);
 }
 
@@ -174,8 +177,11 @@ void AwContentsClientBridge::CancelJsResult(JNIEnv*, jobject, int id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::JavaScriptDialogManager::DialogClosedCallback* callback =
       pending_js_dialog_callbacks_.Lookup(id);
-  if (callback)
-    callback->Run(false, string16());
+  if (!callback) {
+    LOG(WARNING) << "Unexpected JS dialog cancel. " << id;
+    return;
+  }
+  callback->Run(false, string16());
   pending_js_dialog_callbacks_.Remove(id);
 }