Migrate PrivetTrafficDetector to use NetworkConnectionTracker.

This migrates PrivetTrafficDetector from using
net::NetworkChangeNotifier to content::NetworkConnectionTracker, which
works with the network service enabled.

Bug: 859134
Change-Id: I06f2ecbe142bbed9a8772f69ab109b0c0dc32581
Reviewed-on: https://chromium-review.googlesource.com/1123681Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574700}

chrome/browser/printing/cloud_print/privet_traffic_detector.cc

@@ -14,8 +14,10 @@
 #include "base/task_scheduler/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "chrome/browser/browser_process.h"
 #include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
+#include "net/base/network_change_notifier.h"
 #include "net/base/network_interfaces.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/dns_response.h"
@@ -83,20 +85,22 @@ void PrivetTrafficDetector::Start() {
 
 PrivetTrafficDetector::~PrivetTrafficDetector() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
+  g_browser_process->network_connection_tracker()
+      ->RemoveNetworkConnectionObserver(this);
 }
 
 void PrivetTrafficDetector::StartOnIOThread() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
+  g_browser_process->network_connection_tracker()->AddNetworkConnectionObserver(
+      this);
   ScheduleRestart();
 }
 
-void PrivetTrafficDetector::OnNetworkChanged(
-    net::NetworkChangeNotifier::ConnectionType type) {
+void PrivetTrafficDetector::OnConnectionChanged(
+    network::mojom::ConnectionType type) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   restart_attempts_ = kMaxRestartAttempts;
-  if (type != net::NetworkChangeNotifier::CONNECTION_NONE)
+  if (type != network::mojom::ConnectionType::CONNECTION_NONE)
     ScheduleRestart();
 }
 

chrome/browser/printing/cloud_print/privet_traffic_detector.h

@@ -11,9 +11,9 @@
 #include "base/cancelable_callback.h"
 #include "base/macros.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/network_connection_tracker.h"
 #include "net/base/address_family.h"
 #include "net/base/ip_endpoint.h"
-#include "net/base/network_change_notifier.h"
 
 namespace net {
 class DatagramServerSocket;
@@ -28,8 +28,9 @@ namespace cloud_print {
 // When traffic is detected, class fires callback and shutdowns itself.
 class PrivetTrafficDetector
     : public base::RefCountedThreadSafe<
-          PrivetTrafficDetector, content::BrowserThread::DeleteOnIOThread>,
-      private net::NetworkChangeNotifier::NetworkChangeObserver {
+          PrivetTrafficDetector,
+          content::BrowserThread::DeleteOnIOThread>,
+      private content::NetworkConnectionTracker::NetworkConnectionObserver {
  public:
   PrivetTrafficDetector(net::AddressFamily address_family,
                         const base::Closure& on_traffic_detected);
@@ -42,9 +43,8 @@ class PrivetTrafficDetector
   friend class base::DeleteHelper<PrivetTrafficDetector>;
   ~PrivetTrafficDetector() override;
 
-    // net::NetworkChangeNotifier::NetworkChangeObserver implementation.
-  void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) override;
+  // content::NetworkConnectionTracker::NetworkConnectionObserver:
+  void OnConnectionChanged(network::mojom::ConnectionType type) override;
 
   void StartOnIOThread();
   void ScheduleRestart();