Move connectivity detector

Move connectivity detector to a common directory. This CL does
not make any functional changes, but it allows for reuse
of connectivity detector by other features.

Change-Id: Ic3ac9693301eba47d4d44134fd609d1d6644416b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460831Reviewed-by: Jian Li <jianli@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819554}

chrome/android/chrome_java_sources.gni

@@ -936,6 +936,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegate.java",
   "java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegateImpl.java",
   "java/src/org/chromium/chrome/browser/navigation_predictor/NavigationPredictorBridge.java",
+  "java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java",
   "java/src/org/chromium/chrome/browser/net/nqe/NetworkQualityObserver.java",
   "java/src/org/chromium/chrome/browser/net/nqe/NetworkQualityProvider.java",
   "java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java",
@@ -1046,7 +1047,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/offlinepages/TaskExtrasPacker.java",
   "java/src/org/chromium/chrome/browser/offlinepages/TriggerConditions.java",
   "java/src/org/chromium/chrome/browser/offlinepages/downloads/OfflinePageDownloadBridge.java",
-  "java/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetector.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java",

chrome/android/chrome_test_java_sources.gni

@@ -278,6 +278,8 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowTestHelper.java",
   "javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtilsTest.java",
+  "javatests/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetectorDelegateStub.java",
+  "javatests/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetectorTest.java",
   "javatests/src/org/chromium/chrome/browser/night_mode/ChromeNightModeTestUtils.java",
   "javatests/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilderTest.java",
@@ -310,8 +312,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/RecentTabsTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/RequestCoordinatorBridgeTest.java",
-  "javatests/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetectorDelegateStub.java",
-  "javatests/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetectorTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchConfigurationTest.java",

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetector.java → chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java

@@ -2,7 +2,7 @@
 // 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.indicator;
+package org.chromium.chrome.browser.net.connectivitydetector;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -168,7 +168,7 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp
                 if (capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
                         && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                         && capabilities.hasCapability(
-                                   NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)) {
+                                NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)) {
                     return ConnectionState.VALIDATED;
                 }
                 if (capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL)) {
@@ -428,8 +428,7 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp
             protected void onPostExecute(Integer result) {
                 callback.onResult(result);
             }
-        }
-                .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     private void scheduleNextConnectivityCheck() {
@@ -482,15 +481,15 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp
         setConnectionState(newConnectionState);
     }
 
-    @VisibleForTesting
-    void setConnectionState(@ConnectionState int connectionState) {
+    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+    public void setConnectionState(@ConnectionState int connectionState) {
         if (mConnectionState == connectionState) return;
         mConnectionState = connectionState;
         if (mObserver != null) mObserver.onConnectionStateChanged(mConnectionState);
     }
 
-    @VisibleForTesting
-    static void setDelegateForTesting(Delegate delegate) {
+    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+    public static void setDelegateForTesting(Delegate delegate) {
         sOveriddenDelegate = delegate;
     }
 

chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/OWNERS

+file://components/offline_pages/OWNERS
+
+# TEAM: offline-dev@chromium.org
+# COMPONENT: UI>Browser>Offline
\ No newline at end of file

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java

@@ -16,7 +16,8 @@ import org.chromium.base.Callback;
 import org.chromium.base.Log;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
-import org.chromium.chrome.browser.offlinepages.indicator.ConnectivityDetector.ConnectionState;
+import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
+import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
 import org.chromium.chrome.browser.version.ChromeVersionInfo;
 import org.chromium.components.variations.VariationsAssociatedData;
 

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java

@@ -22,6 +22,7 @@ import org.chromium.chrome.browser.app.ChromeActivity;
 import org.chromium.chrome.browser.download.DownloadOpenSource;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetectorDelegateStub.java → chrome/android/javatests/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetectorDelegateStub.java

@@ -2,7 +2,7 @@
 // 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.indicator;
+package org.chromium.chrome.browser.net.connectivitydetector;
 
 /**
  * Stub of ConnectivityDetector.Delegate for testing purpose.

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetectorTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetectorTest.java

@@ -2,7 +2,7 @@
 // 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.indicator;
+package org.chromium.chrome.browser.net.connectivitydetector;
 
 import android.support.test.InstrumentationRegistry;
 

chrome/android/javatests/src/org/chromium/chrome/browser/net/connectivitydetector/OWNERS

+file://chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OWNERS
+
+# TEAM: offline-dev@chromium.org
+# COMPONENT: UI>Browser>Offline
\ No newline at end of file

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerTest.java

@@ -23,6 +23,8 @@ import org.chromium.chrome.browser.app.ChromeActivity;
 import org.chromium.chrome.browser.download.DownloadActivity;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
+import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
+import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetectorDelegateStub;
 import org.chromium.chrome.browser.offlinepages.ClientId;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;

chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetectorUnitTest.java

@@ -26,7 +26,8 @@ import org.mockito.MockitoAnnotations;
 
 import org.chromium.base.ApplicationState;
 import org.chromium.base.test.BaseRobolectricTestRunner;
-import org.chromium.chrome.browser.offlinepages.indicator.ConnectivityDetector.ConnectionState;
+import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
+import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
 
 /**
  * Unit tests for {@link OfflineDetector}.

chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2UnitTest.java

@@ -34,7 +34,8 @@ import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.offlinepages.indicator.ConnectivityDetector.ConnectionState;
+import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
+import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
 import org.chromium.chrome.browser.status_indicator.StatusIndicatorCoordinator;
 
 /**