| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" | 5 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/macros.h" |
| 8 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 9 #include "chrome/browser/captive_portal/captive_portal_service.h" | 10 #include "chrome/browser/captive_portal/captive_portal_service.h" |
| 10 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 11 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
| 11 #include "content/public/browser/interstitial_page.h" | 12 #include "content/public/browser/interstitial_page.h" |
| 12 #include "content/public/browser/interstitial_page_delegate.h" | 13 #include "content/public/browser/interstitial_page_delegate.h" |
| 13 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
| 14 #include "net/base/net_errors.h" | 15 #include "net/base/net_errors.h" |
| 15 #include "net/cert/cert_status_flags.h" | 16 #include "net/cert/cert_status_flags.h" |
| 16 #include "net/ssl/ssl_info.h" | 17 #include "net/ssl/ssl_info.h" |
| 17 #include "testing/gmock/include/gmock/gmock.h" | 18 #include "testing/gmock/include/gmock/gmock.h" |
| (...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 696 | 697 |
| 697 // There should be no captive portal check pending after the redirect. | 698 // There should be no captive portal check pending after the redirect. |
| 698 base::MessageLoop::current()->RunUntilIdle(); | 699 base::MessageLoop::current()->RunUntilIdle(); |
| 699 | 700 |
| 700 // Logging in shouldn't do anything. | 701 // Logging in shouldn't do anything. |
| 701 tab_reloader().OnCaptivePortalResults( | 702 tab_reloader().OnCaptivePortalResults( |
| 702 captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL, | 703 captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL, |
| 703 captive_portal::RESULT_INTERNET_CONNECTED); | 704 captive_portal::RESULT_INTERNET_CONNECTED); |
| 704 EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state()); | 705 EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state()); |
| 705 } | 706 } |
| OLD | NEW |