Migrate extensions::NetworkingPrivateServiceClient to use NetworkConnectionTracker

This migrates extensions::NetworkingPrivateServiceClient from
NetworkChangeNotifier to NetworkConnectionTracker, which works with the
network service enabled.

Bug: 887043
Change-Id: I189fc631c5b4050d2e4bffab627754157e9ec20a
Reviewed-on: https://chromium-review.googlesource.com/1237382
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593652}

extensions/browser/api/networking_private/networking_private_service_client.cc

@@ -16,6 +16,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/onc/onc_constants.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/network_service_instance.h"
 #include "extensions/browser/api/networking_private/networking_private_api.h"
 #include "extensions/browser/api/networking_private/networking_private_delegate_observer.h"
 
@@ -68,7 +69,7 @@ NetworkingPrivateServiceClient::NetworkingPrivateServiceClient(
           base::Bind(&NetworkingPrivateServiceClient::
                          OnNetworkListChangedEventOnUIThread,
                      weak_factory_.GetWeakPtr())));
-  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
+  content::GetNetworkConnectionTracker()->AddNetworkConnectionObserver(this);
 }
 
 NetworkingPrivateServiceClient::~NetworkingPrivateServiceClient() {
@@ -79,7 +80,7 @@ NetworkingPrivateServiceClient::~NetworkingPrivateServiceClient() {
 
 void NetworkingPrivateServiceClient::Shutdown() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
+  content::GetNetworkConnectionTracker()->RemoveNetworkConnectionObserver(this);
   // Clear callbacks map to release callbacks from UI thread.
   callbacks_map_.Clear();
   // Post ShutdownWifiServiceOnWorkerThread task to delete services when all
@@ -99,8 +100,8 @@ void NetworkingPrivateServiceClient::RemoveObserver(
   network_events_observers_.RemoveObserver(observer);
 }
 
-void NetworkingPrivateServiceClient::OnNetworkChanged(
-    net::NetworkChangeNotifier::ConnectionType type) {
+void NetworkingPrivateServiceClient::OnConnectionChanged(
+    network::mojom::ConnectionType type) {
   task_runner_->PostTask(FROM_HERE,
                          base::Bind(&WiFiService::RequestConnectedNetworkUpdate,
                                     base::Unretained(wifi_service_.get())));

extensions/browser/api/networking_private/networking_private_service_client.h

@@ -21,7 +21,7 @@
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/wifi/wifi_service.h"
 #include "extensions/browser/api/networking_private/networking_private_delegate.h"
-#include "net/base/network_change_notifier.h"
+#include "services/network/public/cpp/network_connection_tracker.h"
 
 namespace base {
 class SequencedTaskRunner;
@@ -35,7 +35,7 @@ namespace extensions {
 // WiFiService on the worker thread. Created and called from the UI thread.
 class NetworkingPrivateServiceClient
     : public NetworkingPrivateDelegate,
-      net::NetworkChangeNotifier::NetworkChangeObserver {
+      network::NetworkConnectionTracker::NetworkConnectionObserver {
  public:
   // Takes ownership of |wifi_service| which is accessed and deleted on the
   // worker thread. The deletion task is posted from the destructor.
@@ -117,9 +117,8 @@ class NetworkingPrivateServiceClient
   void AddObserver(NetworkingPrivateDelegateObserver* observer) override;
   void RemoveObserver(NetworkingPrivateDelegateObserver* observer) override;
 
-  // NetworkChangeNotifier::NetworkChangeObserver implementation.
-  void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) override;
+  // NetworkConnectionTracker::NetworkConnectionObserver implementation.
+  void OnConnectionChanged(network::mojom::ConnectionType type) override;
 
  private:
   // Callbacks to extension api function objects. Keep reference to API object