Android: Clean up NetworkChangeNotifier init

Also remove TODO in test since the test requires access to its custom
context class in other methods.

Bug: 646094
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester
Change-Id: I36534c78d6cb8510f8837f52d8dbe26d9dae1b47
Reviewed-on: https://chromium-review.googlesource.com/517647Reviewed-by: Alok Priyadarshi <alokp@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#476428}

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

@@ -221,7 +221,6 @@ public class DownloadManagerService
     @VisibleForTesting
     protected DownloadManagerService(Context context, DownloadNotifier downloadNotifier,
             Handler handler, long updateDelayInMillis) {
-        // TODO(wnwen): Remove mContext since it is always the application context.
         mContext = context;
         mSharedPrefs = ContextUtils.getAppSharedPreferences();
         // Clean up unused shared prefs. TODO(qinmin): remove this after M61.

chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationServiceTest.java

@@ -50,7 +50,6 @@ public class InvalidationServiceTest {
         mAppContext = new IntentSavingContext(InstrumentationRegistry.getInstrumentation()
                                                       .getTargetContext()
                                                       .getApplicationContext());
-        // TODO(wnwen): Remove mAppContext and just use application context.
         // We don't want to use the system content resolver, so we override it.
         MockSyncContentResolverDelegate delegate = new MockSyncContentResolverDelegate();
         // Android master sync can safely always be on.

chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java

@@ -68,7 +68,7 @@ public class CastBrowserHelper {
             Log.d(TAG, "Loading BrowserStartupController...");
             BrowserStartupController.get(LibraryProcessType.PROCESS_BROWSER)
                     .startBrowserProcessesSync(false);
-            NetworkChangeNotifier.init(context);
+            NetworkChangeNotifier.init();
             // Cast shell always expects to receive notifications to track network state.
             NetworkChangeNotifier.registerToReceiveNotificationsAlways();
             sIsBrowserInitialized = true;

components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java

@@ -43,7 +43,7 @@ public class CronetLibraryLoader {
      * any thread, the load and initialization is performed on init thread.
      */
     public static void ensureInitialized(
-            final Context applicationContext, final CronetEngineBuilderImpl builder) {
+            Context applicationContext, final CronetEngineBuilderImpl builder) {
         synchronized (sLoadLock) {
             if (!sInitThreadInitDone) {
                 ContextUtils.initApplicationContext(applicationContext);
@@ -53,7 +53,7 @@ public class CronetLibraryLoader {
                 postToInitThread(new Runnable() {
                     @Override
                     public void run() {
-                        ensureInitializedOnInitThread(applicationContext);
+                        ensureInitializedOnInitThread();
                     }
                 });
             }
@@ -89,12 +89,12 @@ public class CronetLibraryLoader {
      * the init thread. Ensures that the NetworkChangeNotifier is initialzied and the
      * init thread native MessageLoop is initialized.
      */
-    static void ensureInitializedOnInitThread(Context context) {
+    static void ensureInitializedOnInitThread() {
         assert onInitThread();
         if (sInitThreadInitDone) {
             return;
         }
-        NetworkChangeNotifier.init(context);
+        NetworkChangeNotifier.init();
         // Registers to always receive network notifications. Note
         // that this call is fine for Cronet because Cronet
         // embedders do not have API access to create network change

components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java

@@ -165,7 +165,7 @@ public class CronetUrlRequestContext extends CronetEngineBase {
         CronetLibraryLoader.postToInitThread(new Runnable() {
             @Override
             public void run() {
-                CronetLibraryLoader.ensureInitializedOnInitThread(builder.getContext());
+                CronetLibraryLoader.ensureInitializedOnInitThread();
                 synchronized (mLock) {
                     // mUrlRequestContextAdapter is guaranteed to exist until
                     // initialization on init and network threads completes and

net/android/java/src/org/chromium/net/NetworkChangeNotifier.java

@@ -5,7 +5,6 @@
 package org.chromium.net;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
@@ -50,11 +49,6 @@ public class NetworkChangeNotifier {
         mConnectionTypeObservers = new ObserverList<ConnectionTypeObserver>();
     }
 
-    // TODO(wnwen): Remove after downstream no longer depends on this.
-    public static NetworkChangeNotifier init(Context context) {
-        return init();
-    }
-
     /**
      * Initializes the singleton once.
      */

net/android/javatests/src/org/chromium/net/NetworkChangeNotifierNoNativeTest.java

@@ -5,7 +5,6 @@
 package org.chromium.net;
 
 import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
 
 import org.junit.Test;
@@ -27,7 +26,7 @@ public class NetworkChangeNotifierNoNativeTest {
     @MediumTest
     public void testNoNativeDependence() {
         Looper.prepare();
-        NetworkChangeNotifier.init(InstrumentationRegistry.getInstrumentation().getTargetContext());
+        NetworkChangeNotifier.init();
         NetworkChangeNotifier.registerToReceiveNotificationsAlways();
     }
 }
\ No newline at end of file