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 <map> | 5 #include <map> |
6 #include <memory> | 6 #include <memory> |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/base_switches.h" | 12 #include "base/base_switches.h" |
13 #include "base/bind.h" | 13 #include "base/bind.h" |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
16 #include "base/files/file_path.h" | 16 #include "base/files/file_path.h" |
17 #include "base/macros.h" | 17 #include "base/macros.h" |
18 #include "base/message_loop/message_loop.h" | 18 #include "base/message_loop/message_loop.h" |
19 #include "base/path_service.h" | 19 #include "base/path_service.h" |
20 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
| 21 #include "base/threading/sequenced_worker_pool.h" |
21 #include "base/values.h" | 22 #include "base/values.h" |
22 #include "build/build_config.h" | 23 #include "build/build_config.h" |
23 #include "chrome/browser/captive_portal/captive_portal_service.h" | 24 #include "chrome/browser/captive_portal/captive_portal_service.h" |
24 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" | 25 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" |
25 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" | 26 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" |
26 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" | 27 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" |
27 #include "chrome/browser/chrome_notification_types.h" | 28 #include "chrome/browser/chrome_notification_types.h" |
28 #include "chrome/browser/net/url_request_mock_util.h" | 29 #include "chrome/browser/net/url_request_mock_util.h" |
29 #include "chrome/browser/profiles/profile.h" | 30 #include "chrome/browser/profiles/profile.h" |
30 #include "chrome/browser/ssl/captive_portal_blocking_page.h" | 31 #include "chrome/browser/ssl/captive_portal_blocking_page.h" |
(...skipping 2809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2840 | 2841 |
2841 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD, | 2842 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD, |
2842 GetStateOfTabReloaderAt(browser(), broken_tab_index)); | 2843 GetStateOfTabReloaderAt(browser(), broken_tab_index)); |
2843 | 2844 |
2844 WaitForInterstitialAttach(broken_tab_contents); | 2845 WaitForInterstitialAttach(broken_tab_contents); |
2845 portal_observer.WaitForResults(1); | 2846 portal_observer.WaitForResults(1); |
2846 | 2847 |
2847 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, | 2848 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, |
2848 GetInterstitialType(broken_tab_contents)); | 2849 GetInterstitialType(broken_tab_contents)); |
2849 } | 2850 } |
OLD | NEW |