Index: chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc |
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc |
index 5b28e7e39c84d8e6f1d31fd107da88108acf8366..93c2e38a703095a62d71b808da69707e4cda0be0 100644 |
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc |
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc |
@@ -138,7 +138,7 @@ class NetworkPortalDetectorImplTest |
test_api.SetBehindPortal(); |
static_cast<NetworkLibraryImplBase*>( |
network_library())->CallConnectToNetwork(network); |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
} |
void SetConnected(Network* network) { |
@@ -146,7 +146,7 @@ class NetworkPortalDetectorImplTest |
test_api.SetConnected(); |
static_cast<NetworkLibraryImplBase*>( |
network_library())->CallConnectToNetwork(network); |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
} |
private: |
@@ -161,7 +161,7 @@ class NetworkPortalDetectorImplTest |
// Pointer to a fake wifi2 network. |
Network* wifi2_network_; |
- MessageLoop message_loop_; |
+ base::MessageLoop message_loop_; |
scoped_ptr<TestingProfile> profile_; |
scoped_ptr<NetworkPortalDetectorImpl> network_portal_detector_; |
@@ -325,7 +325,7 @@ TEST_F(NetworkPortalDetectorImplTest, PortalDetectionTimeout) { |
ASSERT_EQ(0, attempt_count()); |
SetConnected(wifi1_network()); |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
// First portal detection timeouts, next portal detection is |
// scheduled. |
@@ -388,7 +388,7 @@ TEST_F(NetworkPortalDetectorImplTest, FirstAttemptFailed) { |
ASSERT_EQ(base::TimeDelta::FromSeconds(0), next_attempt_delay()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::OK, 204, NULL); |
ASSERT_TRUE(is_state_idle()); |
@@ -414,7 +414,7 @@ TEST_F(NetworkPortalDetectorImplTest, AllAttemptsFailed) { |
ASSERT_EQ(base::TimeDelta::FromSeconds(0), next_attempt_delay()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::OK, 503, retry_after); |
ASSERT_TRUE(is_state_portal_detection_pending()); |
@@ -422,7 +422,7 @@ TEST_F(NetworkPortalDetectorImplTest, AllAttemptsFailed) { |
ASSERT_EQ(base::TimeDelta::FromSeconds(0), next_attempt_delay()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::OK, 503, retry_after); |
ASSERT_TRUE(is_state_idle()); |
@@ -443,7 +443,7 @@ TEST_F(NetworkPortalDetectorImplTest, ProxyAuthRequired) { |
wifi1_network()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::OK, 407, NULL); |
ASSERT_EQ(2, attempt_count()); |
@@ -452,7 +452,7 @@ TEST_F(NetworkPortalDetectorImplTest, ProxyAuthRequired) { |
wifi1_network()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::OK, 407, NULL); |
ASSERT_EQ(3, attempt_count()); |
@@ -476,7 +476,7 @@ TEST_F(NetworkPortalDetectorImplTest, NoResponseButBehindPortal) { |
ASSERT_TRUE(is_state_portal_detection_pending()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::ERR_CONNECTION_CLOSED, |
net::URLFetcher::RESPONSE_CODE_INVALID, |
@@ -485,7 +485,7 @@ TEST_F(NetworkPortalDetectorImplTest, NoResponseButBehindPortal) { |
ASSERT_TRUE(is_state_portal_detection_pending()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::ERR_CONNECTION_CLOSED, |
net::URLFetcher::RESPONSE_CODE_INVALID, |
@@ -514,7 +514,7 @@ TEST_F(NetworkPortalDetectorImplTest, LazyDetectionForOnlineNetwork) { |
wifi1_network()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::OK, 204, NULL); |
@@ -525,7 +525,7 @@ TEST_F(NetworkPortalDetectorImplTest, LazyDetectionForOnlineNetwork) { |
wifi1_network()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
disable_lazy_detection(); |
@@ -556,7 +556,7 @@ TEST_F(NetworkPortalDetectorImplTest, LazyDetectionForPortalNetwork) { |
wifi1_network()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::ERR_CONNECTION_CLOSED, |
net::URLFetcher::RESPONSE_CODE_INVALID, |
@@ -567,7 +567,7 @@ TEST_F(NetworkPortalDetectorImplTest, LazyDetectionForPortalNetwork) { |
wifi1_network()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
CompleteURLFetch(net::OK, 200, NULL); |
ASSERT_EQ(3, attempt_count()); |
@@ -576,7 +576,7 @@ TEST_F(NetworkPortalDetectorImplTest, LazyDetectionForPortalNetwork) { |
wifi1_network()); |
// To run CaptivePortalDetector::DetectCaptivePortal(). |
- MessageLoop::current()->RunUntilIdle(); |
+ base::MessageLoop::current()->RunUntilIdle(); |
disable_lazy_detection(); |