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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 1320533007: Componentize ssl_config_service_manager_pref.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve -Wnewline-eof mac_chromium bot failure Created 5 years, 2 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/io_thread.h ('k') | chrome/browser/net/ssl_config_service_manager.h » ('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/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 pref_proxy_config_tracker_.reset( 450 pref_proxy_config_tracker_.reset(
451 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 451 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
452 local_state)); 452 local_state));
453 ChromeNetworkDelegate::InitializePrefsOnUIThread( 453 ChromeNetworkDelegate::InitializePrefsOnUIThread(
454 &system_enable_referrers_, 454 &system_enable_referrers_,
455 NULL, 455 NULL,
456 NULL, 456 NULL,
457 NULL, 457 NULL,
458 local_state); 458 local_state);
459 ssl_config_service_manager_.reset( 459 ssl_config_service_manager_.reset(
460 SSLConfigServiceManager::CreateDefaultManager(local_state)); 460 ssl_config::SSLConfigServiceManager::CreateDefaultManager(
461 local_state,
462 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
461 463
462 base::Value* dns_client_enabled_default = new base::FundamentalValue( 464 base::Value* dns_client_enabled_default = new base::FundamentalValue(
463 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); 465 chrome_browser_net::ConfigureAsyncDnsFieldTrial());
464 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, 466 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled,
465 dns_client_enabled_default); 467 dns_client_enabled_default);
466 chrome_browser_net::LogAsyncDnsPrefSource( 468 chrome_browser_net::LogAsyncDnsPrefSource(
467 local_state->FindPreference(prefs::kBuiltInDnsClientEnabled)); 469 local_state->FindPreference(prefs::kBuiltInDnsClientEnabled));
468 470
469 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled, 471 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled,
470 local_state, 472 local_state,
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1604 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); 1606 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass();
1605 1607
1606 context->set_job_factory( 1608 context->set_job_factory(
1607 globals->proxy_script_fetcher_url_request_job_factory.get()); 1609 globals->proxy_script_fetcher_url_request_job_factory.get());
1608 1610
1609 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the 1611 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
1610 // system URLRequestContext too. There's no reason this should be tied to a 1612 // system URLRequestContext too. There's no reason this should be tied to a
1611 // profile. 1613 // profile.
1612 return context; 1614 return context;
1613 } 1615 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.h ('k') | chrome/browser/net/ssl_config_service_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698