| 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 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 // For the ProxyScriptFetcher, we use a direct ProxyService. | 736 // For the ProxyScriptFetcher, we use a direct ProxyService. |
| 737 globals_->proxy_script_fetcher_proxy_service = | 737 globals_->proxy_script_fetcher_proxy_service = |
| 738 net::ProxyService::CreateDirectWithNetLog(net_log_); | 738 net::ProxyService::CreateDirectWithNetLog(net_log_); |
| 739 // In-memory cookie store. | 739 // In-memory cookie store. |
| 740 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 | 740 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
| 741 // is fixed. | 741 // is fixed. |
| 742 tracked_objects::ScopedTracker tracking_profile11( | 742 tracked_objects::ScopedTracker tracking_profile11( |
| 743 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 743 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 744 "466432 IOThread::InitAsync::CreateCookieStore::Start")); | 744 "466432 IOThread::InitAsync::CreateCookieStore::Start")); |
| 745 globals_->system_cookie_store = | 745 globals_->system_cookie_store = |
| 746 content::CreateCookieStore(content::CookieStoreConfig()); | 746 content::CreateCookieStore(content::CookieStoreConfig()); |
| 747 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 | 747 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
| 748 // is fixed. | 748 // is fixed. |
| 749 tracked_objects::ScopedTracker tracking_profile12( | 749 tracked_objects::ScopedTracker tracking_profile12( |
| 750 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 750 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 751 "466432 IOThread::InitAsync::CreateCookieStore::End")); | 751 "466432 IOThread::InitAsync::CreateCookieStore::End")); |
| 752 // In-memory channel ID store. | 752 // In-memory channel ID store. |
| 753 globals_->system_channel_id_service.reset( | 753 globals_->system_channel_id_service.reset( |
| 754 new net::ChannelIDService( | 754 new net::ChannelIDService( |
| 755 new net::DefaultChannelIDStore(NULL), | 755 new net::DefaultChannelIDStore(NULL), |
| 756 base::WorkerPool::GetTaskRunner(true))); | 756 base::WorkerPool::GetTaskRunner(true))); |
| (...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1783 std::move(job_factory); | 1783 std::move(job_factory); |
| 1784 | 1784 |
| 1785 context->set_job_factory( | 1785 context->set_job_factory( |
| 1786 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1786 globals->proxy_script_fetcher_url_request_job_factory.get()); |
| 1787 | 1787 |
| 1788 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1788 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1789 // system URLRequestContext too. There's no reason this should be tied to a | 1789 // system URLRequestContext too. There's no reason this should be tied to a |
| 1790 // profile. | 1790 // profile. |
| 1791 return context; | 1791 return context; |
| 1792 } | 1792 } |
| OLD | NEW |