chrome: Use base::MessageLoop. (Part 3)

chrome/browser/captive_portal/captive_portal_tab_reloader_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 "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
 
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ skipping 117 matching lines @@
 // Simulates a slow SSL load when the Internet is connected.
 TEST_F(CaptivePortalTabReloaderTest, InternetConnected) {
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 
   tab_reloader().OnLoadStart(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
   EXPECT_TRUE(tab_reloader().TimerRunning());
 
   EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(tab_reloader().TimerRunning());
   EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
             tab_reloader().state());
 
   tab_reloader().OnCaptivePortalResults(RESULT_INTERNET_CONNECTED,
                                         RESULT_INTERNET_CONNECTED);
 
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
@@ skipping 27 matching lines @@
 // Simulates a slow SSL load when captive portal checks return no response.
 TEST_F(CaptivePortalTabReloaderTest, NoResponse) {
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 
   tab_reloader().OnLoadStart(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
   EXPECT_TRUE(tab_reloader().TimerRunning());
 
   EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(tab_reloader().TimerRunning());
   EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
             tab_reloader().state());
 
   tab_reloader().OnCaptivePortalResults(RESULT_NO_RESPONSE, RESULT_NO_RESPONSE);
 
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
   tab_reloader().OnLoadCommitted(net::OK);
@@ skipping 20 matching lines @@
   tab_reloader().OnLoadCommitted(net::ERR_CONNECTION_TIMED_OUT);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // Simulate the normal login process.  The user logs in before the error page
 // in the original tab commits.
 TEST_F(CaptivePortalTabReloaderTest, Login) {
   tab_reloader().OnLoadStart(true);
 
   EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(tab_reloader().TimerRunning());
   EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
             tab_reloader().state());
 
   // The captive portal service detects a captive portal.  The TabReloader
   // should try and create a new login tab in response.
   EXPECT_CALL(tab_reloader(), MaybeOpenCaptivePortalLoginTab()).Times(1);
   tab_reloader().OnCaptivePortalResults(RESULT_INTERNET_CONNECTED,
                                         RESULT_BEHIND_CAPTIVE_PORTAL);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL,
             tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
   // The user logs on from another tab, and a captive portal check is triggered.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   // The error page commits, which should start an asynchronous reload.
   tab_reloader().OnLoadCommitted(net::ERR_CONNECTION_TIMED_OUT);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // Simulate the normal login process.  The user logs in after the tab finishes
 // loading the error page.
 TEST_F(CaptivePortalTabReloaderTest, LoginLate) {
   tab_reloader().OnLoadStart(true);
 
   EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(tab_reloader().TimerRunning());
   EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
             tab_reloader().state());
 
   // The captive portal service detects a captive portal.  The TabReloader
   // should try and create a new login tab in response.
   EXPECT_CALL(tab_reloader(), MaybeOpenCaptivePortalLoginTab()).Times(1);
   tab_reloader().OnCaptivePortalResults(RESULT_INTERNET_CONNECTED,
                                         RESULT_BEHIND_CAPTIVE_PORTAL);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL,
@@ skipping 95 matching lines @@
 
   // The user logs in from another tab before the tab errors out.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   // The error page commits, which should trigger a reload.
   EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
   tab_reloader().OnLoadCommitted(net::ERR_SSL_PROTOCOL_ERROR);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // Simulate the case that a user has already logged in before the tab receives a
 // captive portal result, but a RESULT_BEHIND_CAPTIVE_PORTAL was received
 // before the tab started loading.
 TEST_F(CaptivePortalTabReloaderTest, AlreadyLoggedIn) {
   tab_reloader().OnLoadStart(true);
 
   EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(tab_reloader().TimerRunning());
   EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
             tab_reloader().state());
 
   // The user has already logged in.  Since the last result found a captive
   // portal, the tab will be reloaded if a timeout is committed.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   // The error page commits, which should start an asynchronous reload.
   tab_reloader().OnLoadCommitted(net::ERR_CONNECTION_TIMED_OUT);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // Same as above, except the result is received even before the timer triggers,
 // due to a captive portal test request from some external source, like a login
 // tab.
 TEST_F(CaptivePortalTabReloaderTest, AlreadyLoggedInBeforeTimerTriggers) {
   tab_reloader().OnLoadStart(true);
 
   // The user has already logged in.  Since the last result indicated there is
   // a captive portal, the tab will be reloaded if it times out.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
   // The error page commits, which should start an asynchronous reload.
   tab_reloader().OnLoadCommitted(net::ERR_CONNECTION_TIMED_OUT);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // Simulate the user logging in while the timer is still running.  May happen
 // if the tab is reloaded just before logging in on another tab.
 TEST_F(CaptivePortalTabReloaderTest, LoginWhileTimerRunning) {
   tab_reloader().OnLoadStart(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
   EXPECT_TRUE(tab_reloader().TimerRunning());
 
   // The user has already logged in.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   // The error page commits, which should start an asynchronous reload.
   tab_reloader().OnLoadCommitted(net::ERR_CONNECTION_TIMED_OUT);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // Simulate a captive portal being detected while the time is still running.
 // The captive portal check triggered by the timer detects the captive portal
 // again, and then the user logs in.
 TEST_F(CaptivePortalTabReloaderTest, BehindPortalResultWhileTimerRunning) {
   tab_reloader().OnLoadStart(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
   EXPECT_TRUE(tab_reloader().TimerRunning());
 
   // The user is behind a captive portal, but since the tab hasn't timed out,
   // the message is ignored.
   tab_reloader().OnCaptivePortalResults(RESULT_INTERNET_CONNECTED,
                                         RESULT_BEHIND_CAPTIVE_PORTAL);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
 
   // The rest proceeds as normal.
   EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
             tab_reloader().state());
 
   // The captive portal service detects a captive portal, and this time the
   // tab tries to create a login tab.
   EXPECT_CALL(tab_reloader(), MaybeOpenCaptivePortalLoginTab()).Times(1);
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_BEHIND_CAPTIVE_PORTAL);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL,
             tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
   // The user logs on from another tab, and a captive portal check is triggered.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   // The error page commits, which should start an asynchronous reload.
   tab_reloader().OnLoadCommitted(net::ERR_CONNECTION_TIMED_OUT);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // The CaptivePortalService detects the user has logged in to a captive portal
 // while the timer is still running, but the original load succeeds, so no
 // reload is done.
 TEST_F(CaptivePortalTabReloaderTest, LogInWhileTimerRunningNoError) {
   tab_reloader().OnLoadStart(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
@@ skipping 38 matching lines @@
   // be reloaded, despite still having a provisional load.
   EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
 }
 
 // Simulate an HTTP redirect to HTTPS, when the Internet is connected.
 TEST_F(CaptivePortalTabReloaderTest, HttpToHttpsRedirectInternetConnected) {
   tab_reloader().OnLoadStart(false);
   // There should be no captive portal check pending.
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // HTTP to HTTPS redirect.
   tab_reloader().OnRedirect(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
   EXPECT_TRUE(tab_reloader().TimerRunning());
 
   EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(tab_reloader().TimerRunning());
   EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
             tab_reloader().state());
 
   tab_reloader().OnCaptivePortalResults(RESULT_INTERNET_CONNECTED,
                                         RESULT_INTERNET_CONNECTED);
 
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
   tab_reloader().OnLoadCommitted(net::OK);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // Simulate an HTTP redirect to HTTPS and subsequent Login, when the user logs
 // in before the original page commits.
 TEST_F(CaptivePortalTabReloaderTest, HttpToHttpsRedirectLogin) {
   tab_reloader().OnLoadStart(false);
   // There should be no captive portal check pending.
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // HTTP to HTTPS redirect.
   tab_reloader().OnRedirect(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
 
   EXPECT_CALL(tab_reloader(), CheckForCaptivePortal()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(tab_reloader().TimerRunning());
   EXPECT_EQ(CaptivePortalTabReloader::STATE_MAYBE_BROKEN_BY_PORTAL,
             tab_reloader().state());
 
   // The captive portal service detects a captive portal.  The TabReloader
   // should try and create a new login tab in response.
   EXPECT_CALL(tab_reloader(), MaybeOpenCaptivePortalLoginTab()).Times(1);
   tab_reloader().OnCaptivePortalResults(RESULT_INTERNET_CONNECTED,
                                         RESULT_BEHIND_CAPTIVE_PORTAL);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL,
             tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
   // The user logs on from another tab, and a captive portal check is triggered.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   // The error page commits, which should start an asynchronous reload.
   tab_reloader().OnLoadCommitted(net::ERR_CONNECTION_TIMED_OUT);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             tab_reloader().state());
 
   EXPECT_CALL(tab_reloader(), ReloadTab()).Times(1);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // Simulate the case where an HTTPs page redirects to an HTTPS page, before
 // the timer triggers.
 TEST_F(CaptivePortalTabReloaderTest, HttpsToHttpRedirect) {
   tab_reloader().OnLoadStart(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
 
   tab_reloader().OnRedirect(false);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
   // There should be no captive portal check pending after the redirect.
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // Logging in shouldn't do anything.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 // Check that an HTTPS to HTTPS redirect results in no timer running.
 TEST_F(CaptivePortalTabReloaderTest, HttpsToHttpsRedirect) {
   tab_reloader().OnLoadStart(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
 
   tab_reloader().OnRedirect(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE,
             tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
   // Nothing should happen.
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 }
 
 // Check that an HTTPS to HTTP to HTTPS redirect results in no timer running.
 TEST_F(CaptivePortalTabReloaderTest, HttpsToHttpToHttpsRedirect) {
   tab_reloader().OnLoadStart(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_TIMER_RUNNING,
             tab_reloader().state());
 
   tab_reloader().OnRedirect(false);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
   tab_reloader().OnRedirect(true);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE,
             tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
   // Nothing should happen.
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 }
 
 // Check that an HTTP to HTTP redirect results in the timer not running.
 TEST_F(CaptivePortalTabReloaderTest, HttpToHttpRedirect) {
   tab_reloader().OnLoadStart(false);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 
   tab_reloader().OnRedirect(false);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
   EXPECT_FALSE(tab_reloader().TimerRunning());
 
   // There should be no captive portal check pending after the redirect.
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // Logging in shouldn't do anything.
   tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL,
                                         RESULT_INTERNET_CONNECTED);
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state());
 }
 
 }  // namespace captive_portal