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/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/base64.h" | 10 #include "base/base64.h" |
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 nullptr, | 397 nullptr, |
398 nullptr, | 398 nullptr, |
399 nullptr, | 399 nullptr, |
400 nullptr, | 400 nullptr, |
401 local_state); | 401 local_state); |
402 ssl_config_service_manager_.reset( | 402 ssl_config_service_manager_.reset( |
403 ssl_config::SSLConfigServiceManager::CreateDefaultManager( | 403 ssl_config::SSLConfigServiceManager::CreateDefaultManager( |
404 local_state, | 404 local_state, |
405 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO))); | 405 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO))); |
406 | 406 |
407 base::Value* dns_client_enabled_default = new base::FundamentalValue( | 407 base::Value* dns_client_enabled_default = |
408 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); | 408 new base::Value(chrome_browser_net::ConfigureAsyncDnsFieldTrial()); |
409 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, | 409 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, |
410 dns_client_enabled_default); | 410 dns_client_enabled_default); |
411 chrome_browser_net::LogAsyncDnsPrefSource( | 411 chrome_browser_net::LogAsyncDnsPrefSource( |
412 local_state->FindPreference(prefs::kBuiltInDnsClientEnabled)); | 412 local_state->FindPreference(prefs::kBuiltInDnsClientEnabled)); |
413 | 413 |
414 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled, | 414 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled, |
415 local_state, | 415 local_state, |
416 base::Bind(&IOThread::UpdateDnsClientEnabled, | 416 base::Bind(&IOThread::UpdateDnsClientEnabled, |
417 base::Unretained(this))); | 417 base::Unretained(this))); |
418 dns_client_enabled_.MoveToThread(io_thread_proxy); | 418 dns_client_enabled_.MoveToThread(io_thread_proxy); |
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1112 | 1112 |
1113 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1113 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
1114 // system URLRequestContext too. There's no reason this should be tied to a | 1114 // system URLRequestContext too. There's no reason this should be tied to a |
1115 // profile. | 1115 // profile. |
1116 return context; | 1116 return context; |
1117 } | 1117 } |
1118 | 1118 |
1119 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { | 1119 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { |
1120 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); | 1120 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); |
1121 } | 1121 } |
OLD | NEW |