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

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1981913002: *DRAFT* Move MediaDeviceIDSalt from chrome/ to components/ and use it in Android WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/profiles/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/chrome_notification_types.h" 30 #include "chrome/browser/chrome_notification_types.h"
31 #include "chrome/browser/content_settings/cookie_settings_factory.h" 31 #include "chrome/browser/content_settings/cookie_settings_factory.h"
32 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 32 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
33 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 33 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
34 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 34 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
35 #include "chrome/browser/devtools/devtools_network_controller.h" 35 #include "chrome/browser/devtools/devtools_network_controller.h"
36 #include "chrome/browser/devtools/devtools_network_transaction_factory.h" 36 #include "chrome/browser/devtools/devtools_network_transaction_factory.h"
37 #include "chrome/browser/download/download_service.h" 37 #include "chrome/browser/download/download_service.h"
38 #include "chrome/browser/download/download_service_factory.h" 38 #include "chrome/browser/download/download_service_factory.h"
39 #include "chrome/browser/io_thread.h" 39 #include "chrome/browser/io_thread.h"
40 #include "chrome/browser/media/media_device_id_salt.h"
41 #include "chrome/browser/net/chrome_http_user_agent_settings.h" 40 #include "chrome/browser/net/chrome_http_user_agent_settings.h"
42 #include "chrome/browser/net/chrome_network_delegate.h" 41 #include "chrome/browser/net/chrome_network_delegate.h"
43 #include "chrome/browser/net/chrome_url_request_context_getter.h" 42 #include "chrome/browser/net/chrome_url_request_context_getter.h"
44 #include "chrome/browser/net/proxy_service_factory.h" 43 #include "chrome/browser/net/proxy_service_factory.h"
45 #include "chrome/browser/net/resource_prefetch_predictor_observer.h" 44 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
46 #include "chrome/browser/policy/cloud/policy_header_service_factory.h" 45 #include "chrome/browser/policy/cloud/policy_header_service_factory.h"
47 #include "chrome/browser/policy/policy_helpers.h" 46 #include "chrome/browser/policy/policy_helpers.h"
48 #include "chrome/browser/predictors/resource_prefetch_predictor.h" 47 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
49 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" 48 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h"
50 #include "chrome/browser/profiles/profile.h" 49 #include "chrome/browser/profiles/profile.h"
51 #include "chrome/browser/profiles/profile_manager.h" 50 #include "chrome/browser/profiles/profile_manager.h"
52 #include "chrome/browser/ssl/chrome_expect_ct_reporter.h" 51 #include "chrome/browser/ssl/chrome_expect_ct_reporter.h"
53 #include "chrome/browser/ui/search/new_tab_page_interceptor_service.h" 52 #include "chrome/browser/ui/search/new_tab_page_interceptor_service.h"
54 #include "chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h" 53 #include "chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h"
55 #include "chrome/common/chrome_paths.h" 54 #include "chrome/common/chrome_paths.h"
56 #include "chrome/common/chrome_switches.h" 55 #include "chrome/common/chrome_switches.h"
57 #include "chrome/common/features.h" 56 #include "chrome/common/features.h"
58 #include "chrome/common/pref_names.h" 57 #include "chrome/common/pref_names.h"
59 #include "chrome/common/url_constants.h" 58 #include "chrome/common/url_constants.h"
60 #include "components/about_handler/about_protocol_handler.h" 59 #include "components/about_handler/about_protocol_handler.h"
61 #include "components/content_settings/core/browser/content_settings_provider.h" 60 #include "components/content_settings/core/browser/content_settings_provider.h"
62 #include "components/content_settings/core/browser/cookie_settings.h" 61 #include "components/content_settings/core/browser/cookie_settings.h"
63 #include "components/content_settings/core/browser/host_content_settings_map.h" 62 #include "components/content_settings/core/browser/host_content_settings_map.h"
64 #include "components/cookie_config/cookie_store_util.h" 63 #include "components/cookie_config/cookie_store_util.h"
65 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" 64 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h"
66 #include "components/dom_distiller/core/url_constants.h" 65 #include "components/dom_distiller/core/url_constants.h"
66 #include "components/media_device_id_salt/media_device_id_salt.h"
67 #include "components/metrics/metrics_pref_names.h" 67 #include "components/metrics/metrics_pref_names.h"
68 #include "components/metrics/metrics_service.h" 68 #include "components/metrics/metrics_service.h"
69 #include "components/net_log/chrome_net_log.h" 69 #include "components/net_log/chrome_net_log.h"
70 #include "components/policy/core/browser/url_blacklist_manager.h" 70 #include "components/policy/core/browser/url_blacklist_manager.h"
71 #include "components/policy/core/common/cloud/policy_header_io_helper.h" 71 #include "components/policy/core/common/cloud/policy_header_io_helper.h"
72 #include "components/policy/core/common/cloud/policy_header_service.h" 72 #include "components/policy/core/common/cloud/policy_header_service.h"
73 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 73 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
74 #include "components/prefs/pref_service.h" 74 #include "components/prefs/pref_service.h"
75 #include "components/signin/core/common/signin_pref_names.h" 75 #include "components/signin/core/common/signin_pref_names.h"
76 #include "components/sync_driver/pref_names.h" 76 #include "components/sync_driver/pref_names.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 #include "net/ssl/client_cert_store_win.h" 160 #include "net/ssl/client_cert_store_win.h"
161 #endif 161 #endif
162 162
163 #if defined(OS_MACOSX) 163 #if defined(OS_MACOSX)
164 #include "net/ssl/client_cert_store_mac.h" 164 #include "net/ssl/client_cert_store_mac.h"
165 #endif 165 #endif
166 166
167 using content::BrowserContext; 167 using content::BrowserContext;
168 using content::BrowserThread; 168 using content::BrowserThread;
169 using content::ResourceContext; 169 using content::ResourceContext;
170 using media_device_id_salt::MediaDeviceIDSalt;
170 171
171 namespace { 172 namespace {
172 173
173 net::CertVerifier* g_cert_verifier_for_testing = nullptr; 174 net::CertVerifier* g_cert_verifier_for_testing = nullptr;
174 175
175 #if defined(DEBUG_DEVTOOLS) 176 #if defined(DEBUG_DEVTOOLS)
176 bool IsSupportedDevToolsURL(const GURL& url, base::FilePath* path) { 177 bool IsSupportedDevToolsURL(const GURL& url, base::FilePath* path) {
177 std::string bundled_path_prefix(chrome::kChromeUIDevToolsBundledPath); 178 std::string bundled_path_prefix(chrome::kChromeUIDevToolsBundledPath);
178 bundled_path_prefix = "/" + bundled_path_prefix + "/"; 179 bundled_path_prefix = "/" + bundled_path_prefix + "/";
179 180
(...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 base::WrapUnique(new DevToolsNetworkTransactionFactory( 1341 base::WrapUnique(new DevToolsNetworkTransactionFactory(
1341 network_controller_handle_.GetController(), shared_session)), 1342 network_controller_handle_.GetController(), shared_session)),
1342 std::move(backend), true /* set_up_quic_server_info */)); 1343 std::move(backend), true /* set_up_quic_server_info */));
1343 } 1344 }
1344 1345
1345 void ProfileIOData::SetCookieSettingsForTesting( 1346 void ProfileIOData::SetCookieSettingsForTesting(
1346 content_settings::CookieSettings* cookie_settings) { 1347 content_settings::CookieSettings* cookie_settings) {
1347 DCHECK(!cookie_settings_.get()); 1348 DCHECK(!cookie_settings_.get());
1348 cookie_settings_ = cookie_settings; 1349 cookie_settings_ = cookie_settings;
1349 } 1350 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698