refactor DownloadManagerService to eliminate variable access on 2 different threads

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.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.download;
 
 import android.app.DownloadManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Environment;
@@ skipping 313 matching lines @@
                 .setDownloadGuid(UUID.randomUUID().toString())
                 .build();
     }
 
     private Context getTestContext() {
         return new AdvancedMockContext(getInstrumentation().getTargetContext());
     }
 
     @MediumTest
     @Feature({"Download"})
-    public void testDownloadProgressIsCalled() throws InterruptedException {
+    public void testAllDownloadProgressIsCalledForSlowUpdates() throws InterruptedException {
         MockDownloadNotifier notifier = new MockDownloadNotifier(getTestContext());
         DownloadManagerServiceForTest dService = new DownloadManagerServiceForTest(
                 getTestContext(), notifier, UPDATE_DELAY_FOR_TEST);
         DownloadInfo downloadInfo = getDownloadInfo();
 
         notifier.expect(MethodID.DOWNLOAD_PROGRESS, downloadInfo);
         dService.onDownloadUpdated(downloadInfo);
         notifier.waitTillExpectedCallsComplete();
 
         // Now post multiple download updated calls and make sure all are received.
@@ skipping 10 matching lines @@
         dService.onDownloadUpdated(update1);
         Thread.sleep(DELAY_BETWEEN_CALLS);
         dService.onDownloadUpdated(update2);
         Thread.sleep(DELAY_BETWEEN_CALLS);
         dService.onDownloadUpdated(update3);
         notifier.waitTillExpectedCallsComplete();
     }
 
     @MediumTest
     @Feature({"Download"})
-    public void testOnlyOneProgressForFastUpdates() throws InterruptedException {
+    public void testOnlyTwoProgressForFastUpdates() throws InterruptedException {
         MockDownloadNotifier notifier = new MockDownloadNotifier(getTestContext());
         DownloadManagerServiceForTest dService = new DownloadManagerServiceForTest(
                 getTestContext(), notifier, LONG_UPDATE_DELAY_FOR_TEST);
         DownloadInfo downloadInfo = getDownloadInfo();
         DownloadInfo update1 = Builder.fromDownloadInfo(downloadInfo)
                 .setPercentCompleted(10).build();
         DownloadInfo update2 = Builder.fromDownloadInfo(downloadInfo)
-                .setPercentCompleted(30).build();
+                .setPercentCompleted(20).build();
         DownloadInfo update3 = Builder.fromDownloadInfo(downloadInfo)
                 .setPercentCompleted(30).build();
 
-        // Should only get one update call, the last update.
-        notifier.expect(MethodID.DOWNLOAD_PROGRESS, update3);
+        // Should get 2 update calls, the first and the last. The 2nd update will be merged into
+        // the last one.
+        notifier.expect(MethodID.DOWNLOAD_PROGRESS, update1)
+                .andThen(MethodID.DOWNLOAD_PROGRESS, update3);
         dService.onDownloadUpdated(update1);
         Thread.sleep(DELAY_BETWEEN_CALLS);
         dService.onDownloadUpdated(update2);
         Thread.sleep(DELAY_BETWEEN_CALLS);
         dService.onDownloadUpdated(update3);
         Thread.sleep(DELAY_BETWEEN_CALLS);
         notifier.waitTillExpectedCallsComplete();
     }
 
     @MediumTest
@@ skipping 252 matching lines @@
                         .setHasUserGesture(false)
                         .build()));
         assertFalse(
                 DownloadManagerService.shouldOpenAfterDownload(new DownloadInfo.Builder()
                         .setContentDisposition("filename=test.pdf")
                         .setMimeType("application/pdf")
                         .setHasUserGesture(false)
                         .build()));
     }
 }