Remove calls to deprecated MessageLoop methods in net.

net/android/network_change_notifier_android_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // See network_change_notifier_android.h for design explanations.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "net/android/network_change_notifier_android.h"
 #include "net/android/network_change_notifier_delegate_android.h"
 #include "net/base/ip_address.h"
 #include "net/base/network_change_notifier.h"
 #include "net/dns/dns_config_service.h"
 #include "net/dns/dns_protocol.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
@@ skipping 186 matching lines @@
     SetOnline();
     EXPECT_EQ(2, notifications_count_getter.Run());
     EXPECT_EQ(NetworkChangeNotifier::CONNECTION_UNKNOWN,
               connection_type_getter.Run());
   }
 
   void SetOnline() {
     delegate_.SetOnline();
     // Note that this is needed because base::ObserverListThreadSafe uses
     // PostTask().
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   void SetOffline() {
     delegate_.SetOffline();
     // See comment above.
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   void FakeMaxBandwidthChange(double max_bandwidth_mbps) {
     delegate_.FakeMaxBandwidthChanged(max_bandwidth_mbps);
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   void FakeNetworkChange(ChangeType change,
                          NetworkChangeNotifier::NetworkHandle network,
                          ConnectionType type) {
     switch (change) {
       case CONNECTED:
         delegate_.FakeNetworkConnected(network, type);
         break;
       case SOON_TO_DISCONNECT:
         delegate_.FakeNetworkSoonToBeDisconnected(network);
         break;
       case DISCONNECTED:
         delegate_.FakeNetworkDisconnected(network);
         break;
       case MADE_DEFAULT:
         delegate_.FakeDefaultNetwork(network, type);
         break;
       case NONE:
         NOTREACHED();
         break;
     }
     // See comment above.
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   void FakePurgeActiveNetworkList(NetworkChangeNotifier::NetworkList networks) {
     delegate_.FakePurgeActiveNetworkList(networks);
     // See comment above.
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   NetworkChangeNotifierDelegateAndroid delegate_;
 };
 
 // Tests that NetworkChangeNotifierDelegateAndroid is initialized with the
 // actual connection type rather than a hardcoded one (e.g.
 // CONNECTION_UNKNOWN). Initializing the connection type to CONNECTION_UNKNOWN
 // and relying on the first network change notification to set it correctly can
 // be problematic in case there is a long delay between the delegate's
@@ skipping 146 matching lines @@
   EXPECT_EQ(1, delegate_observer_.bandwidth_notifications_count());
   SetOnline();
   EXPECT_EQ(2, delegate_observer_.bandwidth_notifications_count());
   SetOnline();
   EXPECT_EQ(2, delegate_observer_.bandwidth_notifications_count());
 }
 
 TEST_F(NetworkChangeNotifierAndroidTest, InitialSignal) {
   DNSChangeObserver dns_change_observer;
   NetworkChangeNotifier::AddDNSObserver(&dns_change_observer);
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
   EXPECT_EQ(1, dns_change_observer.initial_notifications_count());
   EXPECT_EQ(0, dns_change_observer.change_notifications_count());
   NetworkChangeNotifier::RemoveDNSObserver(&dns_change_observer);
 }
 
 TEST_F(NetworkChangeNotifierAndroidTest, NetworkCallbacks) {
   ForceNetworkHandlesSupportedForTesting();
 
   TestNetworkObserver network_observer;
   NetworkChangeNotifier::AddNetworkObserver(&network_observer);
@@ skipping 83 matching lines @@
   NetworkChangeNotifier::GetConnectedNetworks(&network_list);
   EXPECT_EQ(1u, network_list.size());
   EXPECT_EQ(100, network_list[0]);
   EXPECT_EQ(NetworkChangeNotifier::kInvalidNetworkHandle,
             NetworkChangeNotifier::GetDefaultNetwork());
 
   NetworkChangeNotifier::RemoveNetworkObserver(&network_observer);
 }
 
 }  // namespace net