| 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/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "chrome/browser/captive_portal/captive_portal_service.h" | 9 #include "chrome/browser/captive_portal/captive_portal_service.h" |
| 10 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 10 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
| 11 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
| 12 #include "content/public/browser/interstitial_page.h" | 12 #include "content/public/browser/interstitial_page.h" |
| 13 #include "content/public/browser/interstitial_page_delegate.h" | 13 #include "content/public/browser/interstitial_page_delegate.h" |
| 14 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
| 15 #include "content/public/test/test_browser_thread.h" | 15 #include "content/public/test/test_browser_thread.h" |
| 16 #include "googleurl/src/gurl.h" | 16 #include "googleurl/src/gurl.h" |
| 17 #include "net/base/cert_status_flags.h" | |
| 18 #include "net/base/net_errors.h" | 17 #include "net/base/net_errors.h" |
| 18 #include "net/cert/cert_status_flags.h" |
| 19 #include "net/ssl/ssl_info.h" | 19 #include "net/ssl/ssl_info.h" |
| 20 #include "testing/gmock/include/gmock/gmock.h" | 20 #include "testing/gmock/include/gmock/gmock.h" |
| 21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
| 22 | 22 |
| 23 namespace captive_portal { | 23 namespace captive_portal { |
| 24 | 24 |
| 25 // Used for testing CaptivePortalTabReloader in isolation from the observer. | 25 // Used for testing CaptivePortalTabReloader in isolation from the observer. |
| 26 // Exposes a number of private functions and mocks out others. | 26 // Exposes a number of private functions and mocks out others. |
| 27 class TestCaptivePortalTabReloader : public CaptivePortalTabReloader { | 27 class TestCaptivePortalTabReloader : public CaptivePortalTabReloader { |
| 28 public: | 28 public: |
| (...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 // There should be no captive portal check pending after the redirect. | 690 // There should be no captive portal check pending after the redirect. |
| 691 MessageLoop::current()->RunUntilIdle(); | 691 MessageLoop::current()->RunUntilIdle(); |
| 692 | 692 |
| 693 // Logging in shouldn't do anything. | 693 // Logging in shouldn't do anything. |
| 694 tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL, | 694 tab_reloader().OnCaptivePortalResults(RESULT_BEHIND_CAPTIVE_PORTAL, |
| 695 RESULT_INTERNET_CONNECTED); | 695 RESULT_INTERNET_CONNECTED); |
| 696 EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state()); | 696 EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, tab_reloader().state()); |
| 697 } | 697 } |
| 698 | 698 |
| 699 } // namespace captive_portal | 699 } // namespace captive_portal |
| OLD | NEW |