[BackgroundSync] Actually apply android network detection finch param

Also disable it for WebLayer since it doesn't work in that context.

Bug: 1051508
Change-Id: I5368d2c803547cccb54e0e981a77b688ec528a84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2516702
Commit-Queue: Rayan Kanso <rayankans@chromium.org>
Reviewed-by: Mugdha Lakhani <nator@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823997}

chrome/android/javatests/src/org/chromium/chrome/browser/background_sync/BackgroundSyncTest.java

@@ -58,6 +58,8 @@ public final class BackgroundSyncTest {
             "/chrome/test/data/background_sync/background_sync_test.html";
     private static final int TITLE_UPDATE_TIMEOUT_SECONDS = (int) scaleTimeout(10);
     private static final long WAIT_TIME_MS = scaleTimeout(5000);
+    private static final String DISABLE_ANDROID_NETWORK_DETECTION =
+            "BackgroundSync.RelyOnAndroidNetworkDetection:rely_on_android_network_detection/false";
 
     private CountDownLatch mScheduleLatch;
     private CountDownLatch mCancelLatch;
@@ -95,6 +97,7 @@ public final class BackgroundSyncTest {
     @Test
     @MediumTest
     @Feature({"BackgroundSync"})
+    @CommandLineFlags.Add({"force-fieldtrial-params=" + DISABLE_ANDROID_NETWORK_DETECTION})
     public void onSyncCalledWithNetworkConnectivity() throws Exception {
         forceConnectionType(ConnectionType.CONNECTION_NONE);
 

chrome/browser/background_sync/background_sync_delegate_impl.cc

@@ -107,6 +107,10 @@ bool BackgroundSyncDelegateImpl::ShouldDisableBackgroundSync() {
   return BackgroundSyncLauncherAndroid::ShouldDisableBackgroundSync();
 }
 
+bool BackgroundSyncDelegateImpl::ShouldDisableAndroidNetworkDetection() {
+  return false;
+}
+
 #endif  // defined(OS_ANDROID)
 
 void BackgroundSyncDelegateImpl::OnEngagementEvent(

chrome/browser/background_sync/background_sync_delegate_impl.h

@@ -47,6 +47,7 @@ class BackgroundSyncDelegateImpl
       base::TimeDelta delay) override;
   void CancelBrowserWakeup(blink::mojom::BackgroundSyncType sync_type) override;
   bool ShouldDisableBackgroundSync() override;
+  bool ShouldDisableAndroidNetworkDetection() override;
 #endif  // defined(OS_ANDROID)
 
   // SiteEngagementObserver overrides.

components/background_sync/background_sync_controller_impl.cc

@@ -190,6 +190,18 @@ void BackgroundSyncControllerImpl::GetParameterOverrides(
     }
   }
 
+#if defined(OS_ANDROID)
+  // Check if the delegate explicitly disabled this feature.
+  if (delegate_->ShouldDisableAndroidNetworkDetection()) {
+    parameters->rely_on_android_network_detection = false;
+  } else if (base::Contains(field_params, kRelyOnAndroidNetworkDetection)) {
+    if (base::LowerCaseEqualsASCII(field_params[kRelyOnAndroidNetworkDetection],
+                                   "true")) {
+      parameters->rely_on_android_network_detection = true;
+    }
+  }
+#endif
+
   return;
 }
 

components/background_sync/background_sync_delegate.h

@@ -67,6 +67,9 @@ class BackgroundSyncDelegate {
 
   // Whether Background Sync should be disabled.
   virtual bool ShouldDisableBackgroundSync() = 0;
+
+  // Whether to disable Android network detection for connectivity checks.
+  virtual bool ShouldDisableAndroidNetworkDetection() = 0;
 #endif
 };
 

weblayer/browser/background_sync/background_sync_delegate_impl.cc

@@ -86,6 +86,12 @@ bool BackgroundSyncDelegateImpl::ShouldDisableBackgroundSync() {
   // Android L.
   return false;
 }
+
+bool BackgroundSyncDelegateImpl::ShouldDisableAndroidNetworkDetection() {
+  // TODO(crbug.com/1141778): Remove this once waking up the WebLayer
+  // embedder is supported.
+  return true;
+}
 #endif  // defined(OS_ANDROID)
 
 }  // namespace weblayer

weblayer/browser/background_sync/background_sync_delegate_impl.h

@@ -37,6 +37,7 @@ class BackgroundSyncDelegateImpl
       base::TimeDelta delay) override;
   void CancelBrowserWakeup(blink::mojom::BackgroundSyncType sync_type) override;
   bool ShouldDisableBackgroundSync() override;
+  bool ShouldDisableAndroidNetworkDetection() override;
 #endif  // defined(OS_ANDROID)
 
  private: