Change AffiliationFetchThrottler to use NetworkChangeObserver

ConnectionTypeObserver is deprecated.  This CL modifies AffiliationFetchThrottler
to use NetworkChangeObserver instead.

For more details, see the linked design doc in the bug below.

Bug: 754695
Change-Id: I38b53ce245a74c19be41aab2558a9c3e7fc7b1d1
Reviewed-on: https://chromium-review.googlesource.com/1134019Reviewed-by: Vadym Doroshenko <dvadym@chromium.org>
Commit-Queue: Lily Houghton <lilyhoughton@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576188}

components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler.cc

@@ -64,12 +64,12 @@ AffiliationFetchThrottler::AffiliationFetchThrottler(
   DCHECK(delegate);
   // Start observing before querying the current connectivity state, so that if
   // the state changes concurrently in-between, it will not go unnoticed.
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   has_network_connectivity_ = !net::NetworkChangeNotifier::IsOffline();
 }
 
 AffiliationFetchThrottler::~AffiliationFetchThrottler() {
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
 void AffiliationFetchThrottler::SignalNetworkRequestNeeded() {
@@ -108,7 +108,7 @@ void AffiliationFetchThrottler::OnBackoffDelayExpiredCallback() {
   is_fetch_scheduled_ = false;
 
   // Do nothing if network connectivity was lost while this callback was in the
-  // task queue. The callback will be posted in the OnConnectionTypeChanged
+  // task queue. The callback will be posted in the OnNetworkChanged
   // handler once again.
   if (!has_network_connectivity_)
     return;
@@ -121,7 +121,7 @@ void AffiliationFetchThrottler::OnBackoffDelayExpiredCallback() {
     state_ = delegate_->OnCanSendNetworkRequest() ? FETCH_IN_FLIGHT : IDLE;
 }
 
-void AffiliationFetchThrottler::OnConnectionTypeChanged(
+void AffiliationFetchThrottler::OnNetworkChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   bool old_has_network_connectivity = has_network_connectivity_;
   has_network_connectivity_ =

components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler.h

@@ -50,7 +50,7 @@ class AffiliationFetchThrottlerDelegate;
 // periods, so that requests will not be held back for too long after
 // connectivity is restored.
 class AffiliationFetchThrottler
-    : public net::NetworkChangeNotifier::ConnectionTypeObserver {
+    : public net::NetworkChangeNotifier::NetworkChangeObserver {
  public:
   // Creates an instance that will use |tick_clock| as its tick source, and will
   // post to |task_runner| to call the |delegate|'s OnSendNetworkRequest(). The
@@ -114,8 +114,8 @@ class AffiliationFetchThrottler
   // Called back when the |exponential_backoff_| delay expires.
   void OnBackoffDelayExpiredCallback();
 
-  // net::NetworkChangeNotifier::ConnectionTypeObserver:
-  void OnConnectionTypeChanged(
+  // net::NetworkChangeNotifier::NetworkChangeObserver:
+  void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) override;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;