chrome/browser/ssl/ssl_browser_tests.cc - Issue 2914893002: Move some of IOThread's command line logic to network_session_configurator.

Side by Side Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 2914893002: Move some of IOThread's command line logic to network_session_configurator. (Closed)

Patch Set: Fix merge Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « chrome/browser/policy/policy_network_browsertest.cc ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

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 <utility>	5 #include <utility>

6	6

7 #include "base/base64.h"	7 #include "base/base64.h"

8 #include "base/base_switches.h"	8 #include "base/base_switches.h"

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/bind_helpers.h"	10 #include "base/bind_helpers.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 #include "chrome/browser/ui/browser_navigator_params.h"	52 #include "chrome/browser/ui/browser_navigator_params.h"

53 #include "chrome/browser/ui/browser_tabstrip.h"	53 #include "chrome/browser/ui/browser_tabstrip.h"

54 #include "chrome/browser/ui/tabs/tab_strip_model.h"	54 #include "chrome/browser/ui/tabs/tab_strip_model.h"

55 #include "chrome/common/chrome_paths.h"	55 #include "chrome/common/chrome_paths.h"

56 #include "chrome/common/chrome_switches.h"	56 #include "chrome/common/chrome_switches.h"

57 #include "chrome/common/pref_names.h"	57 #include "chrome/common/pref_names.h"

58 #include "chrome/test/base/in_process_browser_test.h"	58 #include "chrome/test/base/in_process_browser_test.h"

59 #include "chrome/test/base/test_launcher_utils.h"	59 #include "chrome/test/base/test_launcher_utils.h"

60 #include "chrome/test/base/ui_test_utils.h"	60 #include "chrome/test/base/ui_test_utils.h"

61 #include "components/content_settings/core/browser/host_content_settings_map.h"	61 #include "components/content_settings/core/browser/host_content_settings_map.h"

	62 #include "components/network_session_configurator/common/network_switches.h"

62 #include "components/network_time/network_time_test_utils.h"	63 #include "components/network_time/network_time_test_utils.h"

63 #include "components/network_time/network_time_tracker.h"	64 #include "components/network_time/network_time_tracker.h"

64 #include "components/prefs/testing_pref_service.h"	65 #include "components/prefs/testing_pref_service.h"

65 #include "components/security_interstitials/core/controller_client.h"	66 #include "components/security_interstitials/core/controller_client.h"

66 #include "components/security_interstitials/core/metrics_helper.h"	67 #include "components/security_interstitials/core/metrics_helper.h"

67 #include "components/security_state/core/security_state.h"	68 #include "components/security_state/core/security_state.h"

68 #include "components/security_state/core/switches.h"	69 #include "components/security_state/core/switches.h"

69 #include "components/ssl_errors/error_classification.h"	70 #include "components/ssl_errors/error_classification.h"

70 #include "components/variations/variations_associated_data.h"	71 #include "components/variations/variations_associated_data.h"

71 #include "components/variations/variations_switches.h"	72 #include "components/variations/variations_switches.h"

(...skipping 4683 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
4755	4756

4756 // Visit a page over https that contains a frame with a redirect.	4757 // Visit a page over https that contains a frame with a redirect.

4757	4758

4758 // XMLHttpRequest insecure content in synchronous mode.	4759 // XMLHttpRequest insecure content in synchronous mode.

4759	4760

4760 // XMLHttpRequest insecure content in asynchronous mode.	4761 // XMLHttpRequest insecure content in asynchronous mode.

4761	4762

4762 // XMLHttpRequest over bad ssl in synchronous mode.	4763 // XMLHttpRequest over bad ssl in synchronous mode.

4763	4764

4764 // XMLHttpRequest over OK ssl in synchronous mode.	4765 // XMLHttpRequest over OK ssl in synchronous mode.

OLD	NEW