Download: Rename DownloadController.DownloadNotificationService.

We have DownloadController.DownloadNotificationService and
DownloadNotificationService.java.

Rename DownloadController.DownloadNotificationService to
DownloadController.Observer. So people will not feel it's related to
notification.

Bug: 922929
Change-Id: I171b2d2840765425b1737abca44ec24035fcc506
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2057492Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Min Qin <qinmin@chromium.org>
Commit-Queue: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742438}

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadController.java

@@ -29,15 +29,13 @@ import org.chromium.ui.base.PermissionCallback;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
- * Java counterpart of android DownloadController.
- *
- * Its a singleton class instantiated by the C++ DownloadController.
+ * Java counterpart of android DownloadController. Owned by native.
  */
 public class DownloadController {
     /**
-     * Class for notifying the application that download has completed.
+     * Class for notifying download events to other classes.
      */
-    public interface DownloadNotificationService {
+    public interface Observer {
         /**
          * Notify the host application that a download is finished.
          * @param downloadInfo Information about the completed download.
@@ -64,14 +62,14 @@ public class DownloadController {
         void onDownloadInterrupted(final DownloadInfo downloadInfo, boolean isAutoResumable);
     }
 
-    private static DownloadNotificationService sDownloadNotificationService;
+    private static Observer sObserver;
 
-    public static void setDownloadNotificationService(DownloadNotificationService service) {
+    public static void setDownloadNotificationService(Observer observer) {
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.DOWNLOAD_OFFLINE_CONTENT_PROVIDER)) {
             return;
         }
 
-        sDownloadNotificationService = service;
+        sObserver = observer;
     }
 
     /**
@@ -84,8 +82,8 @@ public class DownloadController {
         MediaStoreHelper.addImageToGalleryOnSDCard(
                 downloadInfo.getFilePath(), downloadInfo.getMimeType());
 
-        if (sDownloadNotificationService == null) return;
-        sDownloadNotificationService.onDownloadCompleted(downloadInfo);
+        if (sObserver == null) return;
+        sObserver.onDownloadCompleted(downloadInfo);
     }
 
     /**
@@ -94,8 +92,8 @@ public class DownloadController {
      */
     @CalledByNative
     private static void onDownloadInterrupted(DownloadInfo downloadInfo, boolean isAutoResumable) {
-        if (sDownloadNotificationService == null) return;
-        sDownloadNotificationService.onDownloadInterrupted(downloadInfo, isAutoResumable);
+        if (sObserver == null) return;
+        sObserver.onDownloadInterrupted(downloadInfo, isAutoResumable);
     }
 
     /**
@@ -103,8 +101,8 @@ public class DownloadController {
      */
     @CalledByNative
     private static void onDownloadCancelled(DownloadInfo downloadInfo) {
-        if (sDownloadNotificationService == null) return;
-        sDownloadNotificationService.onDownloadCancelled(downloadInfo);
+        if (sObserver == null) return;
+        sObserver.onDownloadCancelled(downloadInfo);
     }
 
     /**
@@ -113,8 +111,8 @@ public class DownloadController {
      */
     @CalledByNative
     private static void onDownloadUpdated(DownloadInfo downloadInfo) {
-        if (sDownloadNotificationService == null) return;
-        sDownloadNotificationService.onDownloadUpdated(downloadInfo);
+        if (sObserver == null) return;
+        sObserver.onDownloadUpdated(downloadInfo);
     }
 
 

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java

@@ -77,14 +77,14 @@ import java.util.Set;
 import java.util.concurrent.RejectedExecutionException;
 
 /**
- * Chrome implementation of the {@link DownloadController.DownloadNotificationService} interface.
+ * Chrome implementation of the {@link DownloadController.Observer} interface.
  * This class is responsible for keeping track of which downloads are in progress. It generates
  * updates for progress of downloads and handles cleaning up of interrupted progress notifications.
  * TODO(qinmin): move BroadcastReceiver inheritance into DownloadManagerBridge, as it
  * handles all Android DownloadManager interactions. And DownloadManagerService should not know
  * download Id issued by Android DownloadManager.
  */
-public class DownloadManagerService implements DownloadController.DownloadNotificationService,
+public class DownloadManagerService implements DownloadController.Observer,
                                                NetworkChangeNotifierAutoDetect.Observer,
                                                DownloadServiceDelegate, ProfileManager.Observer {
     private static final String TAG = "DownloadService";

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

@@ -51,8 +51,7 @@ public class MHTMLPageTest implements CustomMainActivityStart {
 
     private EmbeddedTestServer mTestServer;
 
-    private static class TestDownloadNotificationService
-            implements DownloadController.DownloadNotificationService {
+    private static class TestDownloadNotificationService implements DownloadController.Observer {
         private Semaphore mSemaphore;
 
         TestDownloadNotificationService(Semaphore semaphore) {