Adds request queue removal capability to OfflinePageBridge.

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

 // Copyright 2015 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.chrome.browser.offlinepages;
 
 import android.content.Context;
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ skipping 235 matching lines @@
             expectedUrls.remove(request.getUrl());
         }
     }
 
     @SmallTest
     public void testOfflinePageBridgeDisabledInIncognito() throws Exception {
         initializeBridgeForProfile(true);
         assertEquals(null, mOfflinePageBridge);
     }
 
+    @SmallTest
+    public void testRemoveRequestsFromQueue() throws Exception {
+        String url = "https://www.google.com/";
+        String namespace = "custom_tabs";
+        savePageLater(url, namespace);
+
+        String url2 = "https://mail.google.com/";
+        String namespace2 = "last_n";
+        savePageLater(url2, namespace2);
+
+        SavePageRequest[] requests = getRequestsInQueue();
+        assertEquals(2, requests.length);
+
+        List<SavePageRequest> requestsToRemove = new ArrayList<>();
+        requestsToRemove.add(requests[1]);
+
+        SavePageRequest[] removed = clearRequestsFromQueue(requestsToRemove);
+        assertEquals(requests[1].getRequestId(), removed[0].getRequestId());
+
+        SavePageRequest[] remaining = getRequestsInQueue();
+        assertEquals(1, remaining.length);
+
+        assertEquals(requests[0].getRequestId(), remaining[0].getRequestId());
+        assertEquals(requests[0].getUrl(), remaining[0].getUrl());
+    }
+
     private void savePage(final int expectedResult, final String expectedUrl)
             throws InterruptedException {
         final Semaphore semaphore = new Semaphore(0);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 assertNotNull("Tab is null", getActivity().getActivityTab());
                 assertEquals("URL does not match requested.", expectedUrl,
                         getActivity().getActivityTab().getUrl());
                 assertNotNull("WebContents is null",
@@ skipping 130 matching lines @@
                     public void onResult(SavePageRequest[] requestsInQueue) {
                         ref.set(requestsInQueue);
                         semaphore.release();
                     }
                 });
             }
         });
         assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
         return ref.get();
     }
+
+    private SavePageRequest[] clearRequestsFromQueue(final List<SavePageRequest> requestsToRemove)
+            throws InterruptedException {
+        final AtomicReference<SavePageRequest[]> ref = new AtomicReference<>();
+        final Semaphore semaphore = new Semaphore(0);
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mOfflinePageBridge.clearRequestsFromQueue(
+                        requestsToRemove, new Callback<SavePageRequest[]>() {
+                            @Override
+                            public void onResult(SavePageRequest[] removedRequests) {
+                                ref.set(removedRequests);
+                                semaphore.release();
+                            }
+                        });
+            }
+        });
+        assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        return ref.get();
+    }
 }