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 <memory> | 5 #include <memory> |
6 #include <utility> | 6 #include <utility> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "chrome/browser/ui/browser.h" | 28 #include "chrome/browser/ui/browser.h" |
29 #include "chrome/browser/ui/browser_commands.h" | 29 #include "chrome/browser/ui/browser_commands.h" |
30 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 30 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
31 #include "chrome/common/chrome_paths.h" | 31 #include "chrome/common/chrome_paths.h" |
32 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
33 #include "chrome/common/pref_names.h" | 33 #include "chrome/common/pref_names.h" |
34 #include "chrome/test/base/in_process_browser_test.h" | 34 #include "chrome/test/base/in_process_browser_test.h" |
35 #include "chrome/test/base/ui_test_utils.h" | 35 #include "chrome/test/base/ui_test_utils.h" |
36 #include "components/error_page/common/error_page_switches.h" | 36 #include "components/error_page/common/error_page_switches.h" |
37 #include "components/google/core/browser/google_util.h" | 37 #include "components/google/core/browser/google_util.h" |
| 38 #include "components/policy/policy_constants.h" |
38 #include "components/prefs/pref_service.h" | 39 #include "components/prefs/pref_service.h" |
39 #include "components/strings/grit/components_strings.h" | 40 #include "components/strings/grit/components_strings.h" |
40 #include "content/public/browser/browser_thread.h" | 41 #include "content/public/browser/browser_thread.h" |
41 #include "content/public/browser/notification_service.h" | 42 #include "content/public/browser/notification_service.h" |
42 #include "content/public/browser/notification_types.h" | 43 #include "content/public/browser/notification_types.h" |
43 #include "content/public/browser/render_frame_host.h" | 44 #include "content/public/browser/render_frame_host.h" |
44 #include "content/public/browser/render_view_host.h" | 45 #include "content/public/browser/render_view_host.h" |
45 #include "content/public/browser/web_contents.h" | 46 #include "content/public/browser/web_contents.h" |
46 #include "content/public/browser/web_contents_observer.h" | 47 #include "content/public/browser/web_contents_observer.h" |
47 #include "content/public/test/browser_test_utils.h" | 48 #include "content/public/test/browser_test_utils.h" |
48 #include "content/public/test/test_navigation_observer.h" | 49 #include "content/public/test/test_navigation_observer.h" |
49 #include "net/base/filename_util.h" | 50 #include "net/base/filename_util.h" |
50 #include "net/base/net_errors.h" | 51 #include "net/base/net_errors.h" |
51 #include "net/http/failing_http_transaction_factory.h" | 52 #include "net/http/failing_http_transaction_factory.h" |
52 #include "net/http/http_cache.h" | 53 #include "net/http/http_cache.h" |
53 #include "net/test/embedded_test_server/embedded_test_server.h" | 54 #include "net/test/embedded_test_server/embedded_test_server.h" |
54 #include "net/test/url_request/url_request_failed_job.h" | 55 #include "net/test/url_request/url_request_failed_job.h" |
55 #include "net/test/url_request/url_request_mock_http_job.h" | 56 #include "net/test/url_request/url_request_mock_http_job.h" |
56 #include "net/url_request/url_request_context.h" | 57 #include "net/url_request/url_request_context.h" |
57 #include "net/url_request/url_request_context_getter.h" | 58 #include "net/url_request/url_request_context_getter.h" |
58 #include "net/url_request/url_request_filter.h" | 59 #include "net/url_request/url_request_filter.h" |
59 #include "net/url_request/url_request_interceptor.h" | 60 #include "net/url_request/url_request_interceptor.h" |
60 #include "net/url_request/url_request_job.h" | 61 #include "net/url_request/url_request_job.h" |
61 #include "net/url_request/url_request_test_job.h" | 62 #include "net/url_request/url_request_test_job.h" |
62 #include "net/url_request/url_request_test_util.h" | 63 #include "net/url_request/url_request_test_util.h" |
63 #include "policy/policy_constants.h" | |
64 #include "ui/base/l10n/l10n_util.h" | 64 #include "ui/base/l10n/l10n_util.h" |
65 | 65 |
66 #if defined(OS_CHROMEOS) | 66 #if defined(OS_CHROMEOS) |
67 #include "chrome/browser/browser_process.h" | 67 #include "chrome/browser/browser_process.h" |
68 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" | 68 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
69 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 69 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
70 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h" | 70 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h" |
71 #include "components/policy/core/common/policy_types.h" | 71 #include "components/policy/core/common/policy_types.h" |
72 #else | 72 #else |
73 #include "chrome/browser/policy/profile_policy_connector_factory.h" | 73 #include "chrome/browser/policy/profile_policy_connector_factory.h" |
(...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1488 IN_PROC_BROWSER_TEST_F(ErrorPageForIDNTest, IDN) { | 1488 IN_PROC_BROWSER_TEST_F(ErrorPageForIDNTest, IDN) { |
1489 // ERR_UNSAFE_PORT will not trigger navigation corrections. | 1489 // ERR_UNSAFE_PORT will not trigger navigation corrections. |
1490 ui_test_utils::NavigateToURL( | 1490 ui_test_utils::NavigateToURL( |
1491 browser(), | 1491 browser(), |
1492 URLRequestFailedJob::GetMockHttpUrlForHostname(net::ERR_UNSAFE_PORT, | 1492 URLRequestFailedJob::GetMockHttpUrlForHostname(net::ERR_UNSAFE_PORT, |
1493 kHostname)); | 1493 kHostname)); |
1494 EXPECT_TRUE(IsDisplayingText(browser(), kHostnameJSUnicode)); | 1494 EXPECT_TRUE(IsDisplayingText(browser(), kHostnameJSUnicode)); |
1495 } | 1495 } |
1496 | 1496 |
1497 } // namespace | 1497 } // namespace |
OLD | NEW |