Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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:
View unified diff | Download patch
OLDNEW
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/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/metrics/field_trial.h" 14 #include "base/metrics/field_trial.h"
15 #include "base/prefs/pref_service.h"
16 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
17 #include "base/strings/string_split.h" 16 #include "base/strings/string_split.h"
18 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
19 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
20 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
21 #include "base/test/histogram_tester.h" 20 #include "base/test/histogram_tester.h"
22 #include "base/test/simple_test_clock.h" 21 #include "base/test/simple_test_clock.h"
23 #include "base/thread_task_runner_handle.h" 22 #include "base/thread_task_runner_handle.h"
24 #include "base/time/time.h" 23 #include "base/time/time.h"
25 #include "build/build_config.h" 24 #include "build/build_config.h"
(...skipping 17 matching lines...) Expand all
43 #include "chrome/browser/ui/browser_navigator.h" 42 #include "chrome/browser/ui/browser_navigator.h"
44 #include "chrome/browser/ui/browser_navigator_params.h" 43 #include "chrome/browser/ui/browser_navigator_params.h"
45 #include "chrome/browser/ui/browser_tabstrip.h" 44 #include "chrome/browser/ui/browser_tabstrip.h"
46 #include "chrome/browser/ui/tabs/tab_strip_model.h" 45 #include "chrome/browser/ui/tabs/tab_strip_model.h"
47 #include "chrome/common/chrome_paths.h" 46 #include "chrome/common/chrome_paths.h"
48 #include "chrome/common/chrome_switches.h" 47 #include "chrome/common/chrome_switches.h"
49 #include "chrome/common/pref_names.h" 48 #include "chrome/common/pref_names.h"
50 #include "chrome/test/base/in_process_browser_test.h" 49 #include "chrome/test/base/in_process_browser_test.h"
51 #include "chrome/test/base/ui_test_utils.h" 50 #include "chrome/test/base/ui_test_utils.h"
52 #include "components/content_settings/core/browser/host_content_settings_map.h" 51 #include "components/content_settings/core/browser/host_content_settings_map.h"
52 #include "components/prefs/pref_service.h"
53 #include "components/security_interstitials/core/controller_client.h" 53 #include "components/security_interstitials/core/controller_client.h"
54 #include "components/security_interstitials/core/metrics_helper.h" 54 #include "components/security_interstitials/core/metrics_helper.h"
55 #include "components/security_state/security_state_model.h" 55 #include "components/security_state/security_state_model.h"
56 #include "components/security_state/switches.h" 56 #include "components/security_state/switches.h"
57 #include "components/ssl_errors/error_classification.h" 57 #include "components/ssl_errors/error_classification.h"
58 #include "components/variations/variations_associated_data.h" 58 #include "components/variations/variations_associated_data.h"
59 #include "components/web_modal/web_contents_modal_dialog_manager.h" 59 #include "components/web_modal/web_contents_modal_dialog_manager.h"
60 #include "content/public/browser/browser_context.h" 60 #include "content/public/browser/browser_context.h"
61 #include "content/public/browser/cert_store.h" 61 #include "content/public/browser/cert_store.h"
62 #include "content/public/browser/interstitial_page.h" 62 #include "content/public/browser/interstitial_page.h"
(...skipping 2868 matching lines...) Expand 10 before | Expand all | Expand 10 after
2931 2931
2932 // Visit a page over https that contains a frame with a redirect. 2932 // Visit a page over https that contains a frame with a redirect.
2933 2933
2934 // XMLHttpRequest insecure content in synchronous mode. 2934 // XMLHttpRequest insecure content in synchronous mode.
2935 2935
2936 // XMLHttpRequest insecure content in asynchronous mode. 2936 // XMLHttpRequest insecure content in asynchronous mode.
2937 2937
2938 // XMLHttpRequest over bad ssl in synchronous mode. 2938 // XMLHttpRequest over bad ssl in synchronous mode.
2939 2939
2940 // XMLHttpRequest over OK ssl in synchronous mode. 2940 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/browser/supervised_user/child_accounts/child_account_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698