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 <set> | 6 #include <set> |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/base_switches.h" | 11 #include "base/base_switches.h" |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
15 #include "base/files/file_path.h" | 15 #include "base/files/file_path.h" |
16 #include "base/macros.h" | 16 #include "base/macros.h" |
17 #include "base/memory/scoped_ptr.h" | 17 #include "base/memory/scoped_ptr.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/prefs/pref_service.h" | |
21 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
22 #include "base/values.h" | 21 #include "base/values.h" |
23 #include "build/build_config.h" | 22 #include "build/build_config.h" |
24 #include "chrome/browser/captive_portal/captive_portal_service.h" | 23 #include "chrome/browser/captive_portal/captive_portal_service.h" |
25 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" | 24 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" |
26 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" | 25 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" |
27 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" | 26 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" |
28 #include "chrome/browser/chrome_notification_types.h" | 27 #include "chrome/browser/chrome_notification_types.h" |
29 #include "chrome/browser/interstitials/security_interstitial_page.h" | 28 #include "chrome/browser/interstitials/security_interstitial_page.h" |
30 #include "chrome/browser/net/url_request_mock_util.h" | 29 #include "chrome/browser/net/url_request_mock_util.h" |
31 #include "chrome/browser/profiles/profile.h" | 30 #include "chrome/browser/profiles/profile.h" |
32 #include "chrome/browser/ssl/captive_portal_blocking_page.h" | 31 #include "chrome/browser/ssl/captive_portal_blocking_page.h" |
33 #include "chrome/browser/ssl/ssl_blocking_page.h" | 32 #include "chrome/browser/ssl/ssl_blocking_page.h" |
34 #include "chrome/browser/ssl/ssl_error_handler.h" | 33 #include "chrome/browser/ssl/ssl_error_handler.h" |
35 #include "chrome/browser/ui/browser.h" | 34 #include "chrome/browser/ui/browser.h" |
36 #include "chrome/browser/ui/browser_commands.h" | 35 #include "chrome/browser/ui/browser_commands.h" |
37 #include "chrome/browser/ui/browser_finder.h" | 36 #include "chrome/browser/ui/browser_finder.h" |
38 #include "chrome/browser/ui/browser_navigator_params.h" | 37 #include "chrome/browser/ui/browser_navigator_params.h" |
39 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" | 38 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" |
40 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 39 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
41 #include "chrome/common/chrome_paths.h" | 40 #include "chrome/common/chrome_paths.h" |
42 #include "chrome/common/pref_names.h" | 41 #include "chrome/common/pref_names.h" |
43 #include "chrome/test/base/in_process_browser_test.h" | 42 #include "chrome/test/base/in_process_browser_test.h" |
44 #include "chrome/test/base/ui_test_utils.h" | 43 #include "chrome/test/base/ui_test_utils.h" |
| 44 #include "components/prefs/pref_service.h" |
45 #include "content/public/browser/browser_thread.h" | 45 #include "content/public/browser/browser_thread.h" |
46 #include "content/public/browser/interstitial_page.h" | 46 #include "content/public/browser/interstitial_page.h" |
47 #include "content/public/browser/interstitial_page_delegate.h" | 47 #include "content/public/browser/interstitial_page_delegate.h" |
48 #include "content/public/browser/navigation_controller.h" | 48 #include "content/public/browser/navigation_controller.h" |
49 #include "content/public/browser/navigation_entry.h" | 49 #include "content/public/browser/navigation_entry.h" |
50 #include "content/public/browser/notification_observer.h" | 50 #include "content/public/browser/notification_observer.h" |
51 #include "content/public/browser/notification_registrar.h" | 51 #include "content/public/browser/notification_registrar.h" |
52 #include "content/public/browser/notification_service.h" | 52 #include "content/public/browser/notification_service.h" |
53 #include "content/public/browser/notification_types.h" | 53 #include "content/public/browser/notification_types.h" |
54 #include "content/public/browser/render_frame_host.h" | 54 #include "content/public/browser/render_frame_host.h" |
(...skipping 2785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2840 | 2840 |
2841 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD, | 2841 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD, |
2842 GetStateOfTabReloaderAt(browser(), broken_tab_index)); | 2842 GetStateOfTabReloaderAt(browser(), broken_tab_index)); |
2843 | 2843 |
2844 WaitForInterstitialAttach(broken_tab_contents); | 2844 WaitForInterstitialAttach(broken_tab_contents); |
2845 portal_observer.WaitForResults(1); | 2845 portal_observer.WaitForResults(1); |
2846 | 2846 |
2847 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, | 2847 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, |
2848 GetInterstitialType(broken_tab_contents)); | 2848 GetInterstitialType(broken_tab_contents)); |
2849 } | 2849 } |
OLD | NEW |