Adding a way to remove an intent callback.

ui/android/java/src/org/chromium/ui/base/WindowAndroid.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.ui.base;
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ skipping 40 matching lines @@
      * @param errorId The ID of error string to be show if activity is paused before intent
      *        results.
      * @return Whether the intent was shown.
      */
     public boolean showIntent(Intent intent, IntentCallback callback, int errorId) {
         Log.d(TAG, "Can't show intent as context is not an Activity: " + intent);
         return false;
     }
 
     /**
+     * Removes a callback from the list of pending intents, so that nothing happens if/when the
+     * result for that intent is received.
+     * @param callback The object that should have received the results
+     * @return True if the callback was removed, false if it was not found.
+    */
+    public boolean removeIntentCallback(IntentCallback callback) {

[David Trainor- moved to gerrit, 2013/11/19 23:27:39]

Is this meant to cancel the action?  If not, should we just null out the
callback and leave the item in the map so that we still consume the requestcode
response?

Just a suggestion, I'm fine with this approach as well.

[Jay Civelli, 2013/11/20 00:46:40]

You mean removing the callback from mOutstandingIntents but leaving the
requestCode in mIntentErrors?
That means we would't  trigger the callback, but we would show an error message,
right?

+        int requestCode = mOutstandingIntents.indexOfValue(callback);
+        if (requestCode < 0) return false;
+        mOutstandingIntents.remove(requestCode);
+        mIntentErrors.remove(requestCode);
+        return true;
+    }
+
+    /**
      * Displays an error message with a provided error message string.
      * @param error The error message string to be displayed.
      */
     public void showError(String error) {
         if (error != null) {
             Toast.makeText(mApplicationContext, error, Toast.LENGTH_SHORT).show();
         }
     }
 
     /**
@@ skipping 116 matching lines @@
      */
     @CalledByNative
     public byte[] grabSnapshot(int windowX, int windowY, int width, int height) {
         return null;
     }
 
     private native long nativeInit();
     private native void nativeDestroy(long nativeWindowAndroid);
 
 }