1 files changed, 15 insertions, 13 deletions
diff --git a/chromium/content/browser/android/background_sync_network_observer_android.cc b/chromium/content/browser/android/background_sync_network_observer_android.cc
index c1c514c7f4b..77844478b8d 100644
--- a/chromium/content/browser/android/background_sync_network_observer_android.cc
+++ b/chromium/content/browser/android/background_sync_network_observer_android.cc
@@ -4,6 +4,8 @@
 
 #include "content/browser/android/background_sync_network_observer_android.h"
 
+#include "base/task/post_task.h"
+#include "content/public/browser/browser_task_traits.h"
 #include "jni/BackgroundSyncNetworkObserver_jni.h"
 
 using base::android::JavaParamRef;
@@ -13,12 +15,12 @@ namespace content {
 // static
 scoped_refptr<BackgroundSyncNetworkObserverAndroid::Observer>
 BackgroundSyncNetworkObserverAndroid::Observer::Create(
-    base::Callback<void(net::NetworkChangeNotifier::ConnectionType)> callback) {
+    base::Callback<void(network::mojom::ConnectionType)> callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   scoped_refptr<BackgroundSyncNetworkObserverAndroid::Observer> observer(
       new BackgroundSyncNetworkObserverAndroid::Observer(callback));
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::UI},
       base::Bind(&BackgroundSyncNetworkObserverAndroid::Observer::Init,
                  observer));
   return observer;
@@ -48,15 +50,14 @@ void BackgroundSyncNetworkObserverAndroid::Observer::
                                 const JavaParamRef<jobject>& jcaller,
                                 jint new_connection_type) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(callback_,
-                 static_cast<net::NetworkChangeNotifier::ConnectionType>(
-                     new_connection_type)));
+  base::PostTaskWithTraits(
+      FROM_HERE, {BrowserThread::IO},
+      base::Bind(callback_, static_cast<network::mojom::ConnectionType>(
+                                new_connection_type)));
 }
 
 BackgroundSyncNetworkObserverAndroid::Observer::Observer(
-    base::Callback<void(net::NetworkChangeNotifier::ConnectionType)> callback)
+    base::Callback<void(network::mojom::ConnectionType)> callback)
     : callback_(callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
@@ -67,15 +68,16 @@ BackgroundSyncNetworkObserverAndroid::BackgroundSyncNetworkObserverAndroid(
       weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  // Remove the observer attached by the NetworkObserver constructor
-  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
-
   observer_ = Observer::Create(
-      base::Bind(&BackgroundSyncNetworkObserverAndroid::OnNetworkChanged,
+      base::Bind(&BackgroundSyncNetworkObserverAndroid::OnConnectionChanged,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 BackgroundSyncNetworkObserverAndroid::~BackgroundSyncNetworkObserverAndroid() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
+
+void BackgroundSyncNetworkObserverAndroid::RegisterWithNetworkConnectionTracker(
+    network::NetworkConnectionTracker* network_connection_tracker) {}
+
 }  // namespace content