Chromium Code Reviews| 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 "chrome/browser/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 458 signin_allowed_.Init(prefs::kSigninAllowed, pref_service); | 458 signin_allowed_.Init(prefs::kSigninAllowed, pref_service); |
| 459 signin_allowed_.MoveToThread(io_message_loop_proxy); | 459 signin_allowed_.MoveToThread(io_message_loop_proxy); |
| 460 } | 460 } |
| 461 | 461 |
| 462 quick_check_enabled_.Init(prefs::kQuickCheckEnabled, | 462 quick_check_enabled_.Init(prefs::kQuickCheckEnabled, |
| 463 local_state_pref_service); | 463 local_state_pref_service); |
| 464 quick_check_enabled_.MoveToThread(io_message_loop_proxy); | 464 quick_check_enabled_.MoveToThread(io_message_loop_proxy); |
| 465 | 465 |
| 466 media_device_id_salt_ = new MediaDeviceIDSalt(pref_service, IsOffTheRecord()); | 466 media_device_id_salt_ = new MediaDeviceIDSalt(pref_service, IsOffTheRecord()); |
| 467 | 467 |
| 468 // TODO(bnc): remove per https://crbug.com/334602. | |
| 469 network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, | |
|
mmenke
2014/09/02 15:09:29
Shouldn't you remove kNetworkPredictionEnabled as
Bence
2014/09/02 18:09:16
You mean from chrome/common/pref_names.{cc,h}? No
| |
| 470 pref_service); | |
| 471 network_prediction_enabled_.MoveToThread(io_message_loop_proxy); | |
| 472 | |
| 473 network_prediction_options_.Init(prefs::kNetworkPredictionOptions, | 468 network_prediction_options_.Init(prefs::kNetworkPredictionOptions, |
| 474 pref_service); | 469 pref_service); |
| 475 | 470 |
| 476 network_prediction_options_.MoveToThread(io_message_loop_proxy); | 471 network_prediction_options_.MoveToThread(io_message_loop_proxy); |
| 477 | 472 |
| 478 #if defined(OS_CHROMEOS) | 473 #if defined(OS_CHROMEOS) |
| 479 scoped_ptr<policy::PolicyCertVerifier> verifier = | 474 scoped_ptr<policy::PolicyCertVerifier> verifier = |
| 480 policy::PolicyCertServiceFactory::CreateForProfile(profile); | 475 policy::PolicyCertServiceFactory::CreateForProfile(profile); |
| 481 policy_cert_verifier_ = verifier.get(); | 476 policy_cert_verifier_ = verifier.get(); |
| 482 cert_verifier_ = verifier.Pass(); | 477 cert_verifier_ = verifier.Pass(); |
| (...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1212 #if !defined(OS_CHROMEOS) | 1207 #if !defined(OS_CHROMEOS) |
| 1213 enable_metrics_.Destroy(); | 1208 enable_metrics_.Destroy(); |
| 1214 #endif | 1209 #endif |
| 1215 safe_browsing_enabled_.Destroy(); | 1210 safe_browsing_enabled_.Destroy(); |
| 1216 #if defined(SPDY_PROXY_AUTH_ORIGIN) | 1211 #if defined(SPDY_PROXY_AUTH_ORIGIN) |
| 1217 data_reduction_proxy_enabled_.Destroy(); | 1212 data_reduction_proxy_enabled_.Destroy(); |
| 1218 #endif | 1213 #endif |
| 1219 printing_enabled_.Destroy(); | 1214 printing_enabled_.Destroy(); |
| 1220 sync_disabled_.Destroy(); | 1215 sync_disabled_.Destroy(); |
| 1221 signin_allowed_.Destroy(); | 1216 signin_allowed_.Destroy(); |
| 1222 // TODO(bnc): remove per https://crbug.com/334602. | |
| 1223 network_prediction_enabled_.Destroy(); | |
| 1224 network_prediction_options_.Destroy(); | 1217 network_prediction_options_.Destroy(); |
| 1225 quick_check_enabled_.Destroy(); | 1218 quick_check_enabled_.Destroy(); |
| 1226 if (media_device_id_salt_.get()) | 1219 if (media_device_id_salt_.get()) |
| 1227 media_device_id_salt_->ShutdownOnUIThread(); | 1220 media_device_id_salt_->ShutdownOnUIThread(); |
| 1228 session_startup_pref_.Destroy(); | 1221 session_startup_pref_.Destroy(); |
| 1229 #if defined(ENABLE_CONFIGURATION_POLICY) | 1222 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 1230 if (url_blacklist_manager_) | 1223 if (url_blacklist_manager_) |
| 1231 url_blacklist_manager_->ShutdownOnUIThread(); | 1224 url_blacklist_manager_->ShutdownOnUIThread(); |
| 1232 #endif | 1225 #endif |
| 1233 if (chrome_http_user_agent_settings_) | 1226 if (chrome_http_user_agent_settings_) |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1300 void ProfileIOData::SetCookieSettingsForTesting( | 1293 void ProfileIOData::SetCookieSettingsForTesting( |
| 1301 CookieSettings* cookie_settings) { | 1294 CookieSettings* cookie_settings) { |
| 1302 DCHECK(!cookie_settings_.get()); | 1295 DCHECK(!cookie_settings_.get()); |
| 1303 cookie_settings_ = cookie_settings; | 1296 cookie_settings_ = cookie_settings; |
| 1304 } | 1297 } |
| 1305 | 1298 |
| 1306 void ProfileIOData::set_signin_names_for_testing( | 1299 void ProfileIOData::set_signin_names_for_testing( |
| 1307 SigninNamesOnIOThread* signin_names) { | 1300 SigninNamesOnIOThread* signin_names) { |
| 1308 signin_names_.reset(signin_names); | 1301 signin_names_.reset(signin_names); |
| 1309 } | 1302 } |
| OLD | NEW |