Remove calls to deprecated MessageLoop methods on Windows and Linux.

net/base/network_change_notifier_win_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.
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_change_notifier_factory.h"
 #include "net/base/network_change_notifier_win.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AtLeast;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::StrictMock;
@@ skipping 65 matching lines @@
         .Times(1)
         .WillOnce(Return(true));
 
     network_change_notifier_.WatchForAddressChange();
 
     EXPECT_TRUE(network_change_notifier_.is_watching());
     EXPECT_EQ(0, network_change_notifier_.sequential_failures());
 
     // If a task to notify observers of the IP address change event was
     // incorrectly posted, make sure it gets run to trigger a failure.
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   // Calls WatchForAddressChange, and simulates a WatchForAddressChangeInternal
   // failure.
   void StartWatchingAndFail() {
     EXPECT_FALSE(network_change_notifier_.is_watching());
     EXPECT_EQ(0, network_change_notifier_.sequential_failures());
 
     EXPECT_CALL(test_ip_address_observer_, OnIPAddressChanged()).Times(0);
     EXPECT_CALL(network_change_notifier_, WatchForAddressChangeInternal())
         // Due to an expected race, it's theoretically possible for more than
         // one call to occur, though unlikely.
         .Times(AtLeast(1))
         .WillRepeatedly(Return(false));
 
     network_change_notifier_.WatchForAddressChange();
 
     EXPECT_FALSE(network_change_notifier_.is_watching());
     EXPECT_LT(0, network_change_notifier_.sequential_failures());
 
     // If a task to notify observers of the IP address change event was
     // incorrectly posted, make sure it gets run.
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   // Simulates a network change event, resulting in a call to OnObjectSignaled.
   // The resulting call to WatchForAddressChangeInternal then succeeds.
   void SignalAndSucceed() {
     EXPECT_TRUE(network_change_notifier_.is_watching());
     EXPECT_EQ(0, network_change_notifier_.sequential_failures());
 
     EXPECT_CALL(test_ip_address_observer_, OnIPAddressChanged()).Times(1);
     EXPECT_CALL(network_change_notifier_, WatchForAddressChangeInternal())
         .Times(1)
         .WillOnce(Return(true));
 
     network_change_notifier_.OnObjectSignaled(INVALID_HANDLE_VALUE);
 
     EXPECT_TRUE(network_change_notifier_.is_watching());
     EXPECT_EQ(0, network_change_notifier_.sequential_failures());
 
     // Run the task to notify observers of the IP address change event.
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   // Simulates a network change event, resulting in a call to OnObjectSignaled.
   // The resulting call to WatchForAddressChangeInternal then fails.
   void SignalAndFail() {
     EXPECT_TRUE(network_change_notifier_.is_watching());
     EXPECT_EQ(0, network_change_notifier_.sequential_failures());
 
     EXPECT_CALL(test_ip_address_observer_, OnIPAddressChanged()).Times(1);
     EXPECT_CALL(network_change_notifier_, WatchForAddressChangeInternal())
         // Due to an expected race, it's theoretically possible for more than
         // one call to occur, though unlikely.
         .Times(AtLeast(1))
         .WillRepeatedly(Return(false));
 
     network_change_notifier_.OnObjectSignaled(INVALID_HANDLE_VALUE);
 
     EXPECT_FALSE(network_change_notifier_.is_watching());
     EXPECT_LT(0, network_change_notifier_.sequential_failures());
 
     // Run the task to notify observers of the IP address change event.
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   // Runs the message loop until WatchForAddressChange is called again, as a
   // result of the already posted task after a WatchForAddressChangeInternal
   // failure.  Simulates a success on the resulting call to
   // WatchForAddressChangeInternal.
   void RetryAndSucceed() {
     EXPECT_FALSE(network_change_notifier_.is_watching());
     EXPECT_LT(0, network_change_notifier_.sequential_failures());
 
     EXPECT_CALL(test_ip_address_observer_, OnIPAddressChanged())
         .Times(1)
         .WillOnce(Invoke(base::MessageLoop::current(),
                          &base::MessageLoop::QuitWhenIdle));
     EXPECT_CALL(network_change_notifier_, WatchForAddressChangeInternal())
         .Times(1).WillOnce(Return(true));
 
-    base::MessageLoop::current()->Run();
+    base::RunLoop().Run();
 
     EXPECT_TRUE(network_change_notifier_.is_watching());
     EXPECT_EQ(0, network_change_notifier_.sequential_failures());
   }
 
   // Runs the message loop until WatchForAddressChange is called again, as a
   // result of the already posted task after a WatchForAddressChangeInternal
   // failure.  Simulates a failure on the resulting call to
   // WatchForAddressChangeInternal.
   void RetryAndFail() {
     EXPECT_FALSE(network_change_notifier_.is_watching());
     EXPECT_LT(0, network_change_notifier_.sequential_failures());
 
     int initial_sequential_failures =
         network_change_notifier_.sequential_failures();
 
     EXPECT_CALL(test_ip_address_observer_, OnIPAddressChanged()).Times(0);
     EXPECT_CALL(network_change_notifier_, WatchForAddressChangeInternal())
         // Due to an expected race, it's theoretically possible for more than
         // one call to occur, though unlikely.
         .Times(AtLeast(1))
         .WillRepeatedly(Invoke(ExitMessageLoopAndReturnFalse));
 
-    base::MessageLoop::current()->Run();
+    base::RunLoop().Run();
 
     EXPECT_FALSE(network_change_notifier_.is_watching());
     EXPECT_LT(initial_sequential_failures,
               network_change_notifier_.sequential_failures());
 
     // If a task to notify observers of the IP address change event was
     // incorrectly posted, make sure it gets run.
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
  private:
   // Note that the order of declaration here is important.
 
   // Allows creating a new NetworkChangeNotifier.  Must be created before
   // |network_change_notifier_| and destroyed after it to avoid DCHECK failures.
   NetworkChangeNotifier::DisableForTest disable_for_test_;
 
   StrictMock<TestNetworkChangeNotifierWin> network_change_notifier_;
@@ skipping 34 matching lines @@
 }
 
 TEST_F(NetworkChangeNotifierWinTest, NetChangeWinFailSignalTwice) {
   StartWatchingAndSucceed();
   SignalAndFail();
   RetryAndFail();
   RetryAndSucceed();
 }
 
 }  // namespace net