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_impl_io_data.h" | 5 #include "chrome/browser/profiles/profile_impl_io_data.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
11 #include "base/prefs/pref_member.h" | 11 #include "base/prefs/pref_member.h" |
12 #include "base/prefs/pref_service.h" | 12 #include "base/prefs/pref_service.h" |
13 #include "base/sequenced_task_runner.h" | 13 #include "base/sequenced_task_runner.h" |
14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
15 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
16 #include "base/threading/sequenced_worker_pool.h" | 16 #include "base/threading/sequenced_worker_pool.h" |
17 #include "base/threading/worker_pool.h" | 17 #include "base/threading/worker_pool.h" |
18 #include "chrome/browser/chrome_notification_types.h" | 18 #include "chrome/browser/chrome_notification_types.h" |
19 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 19 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
21 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" | 21 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" |
22 #include "chrome/browser/io_thread.h" | 22 #include "chrome/browser/io_thread.h" |
23 #include "chrome/browser/net/chrome_net_log.h" | 23 #include "chrome/browser/net/chrome_net_log.h" |
24 #include "chrome/browser/net/chrome_network_delegate.h" | 24 #include "chrome/browser/net/chrome_network_delegate.h" |
25 #include "chrome/browser/net/connect_interceptor.h" | 25 #include "chrome/browser/net/connect_interceptor.h" |
26 #include "chrome/browser/net/cookie_store_util.h" | 26 #include "chrome/browser/net/cookie_store_util.h" |
27 #include "chrome/browser/net/http_server_properties_manager.h" | 27 #include "chrome/browser/net/http_server_properties_manager.h" |
28 #include "chrome/browser/net/predictor.h" | 28 #include "chrome/browser/net/predictor.h" |
29 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | |
29 #include "chrome/browser/net/sqlite_server_bound_cert_store.h" | 30 #include "chrome/browser/net/sqlite_server_bound_cert_store.h" |
30 #include "chrome/browser/profiles/profile.h" | 31 #include "chrome/browser/profiles/profile.h" |
31 #include "chrome/common/chrome_constants.h" | 32 #include "chrome/common/chrome_constants.h" |
32 #include "chrome/common/chrome_switches.h" | 33 #include "chrome/common/chrome_switches.h" |
33 #include "chrome/common/pref_names.h" | 34 #include "chrome/common/pref_names.h" |
34 #include "chrome/common/url_constants.h" | 35 #include "chrome/common/url_constants.h" |
35 #include "components/domain_reliability/monitor.h" | 36 #include "components/domain_reliability/monitor.h" |
36 #include "content/public/browser/browser_thread.h" | 37 #include "content/public/browser/browser_thread.h" |
37 #include "content/public/browser/cookie_store_factory.h" | 38 #include "content/public/browser/cookie_store_factory.h" |
38 #include "content/public/browser/notification_service.h" | 39 #include "content/public/browser/notification_service.h" |
39 #include "content/public/browser/resource_context.h" | 40 #include "content/public/browser/resource_context.h" |
40 #include "content/public/browser/storage_partition.h" | 41 #include "content/public/browser/storage_partition.h" |
41 #include "extensions/browser/extension_protocols.h" | 42 #include "extensions/browser/extension_protocols.h" |
42 #include "extensions/common/constants.h" | 43 #include "extensions/common/constants.h" |
43 #include "net/base/cache_type.h" | 44 #include "net/base/cache_type.h" |
45 #include "net/base/sdch_manager.h" | |
44 #include "net/ftp/ftp_network_layer.h" | 46 #include "net/ftp/ftp_network_layer.h" |
45 #include "net/http/http_cache.h" | 47 #include "net/http/http_cache.h" |
46 #include "net/ssl/server_bound_cert_service.h" | 48 #include "net/ssl/server_bound_cert_service.h" |
47 #include "net/url_request/url_request_job_factory_impl.h" | 49 #include "net/url_request/url_request_job_factory_impl.h" |
48 #include "webkit/browser/quota/special_storage_policy.h" | 50 #include "webkit/browser/quota/special_storage_policy.h" |
49 | 51 |
50 #if defined(OS_ANDROID) || defined(OS_IOS) | 52 #if defined(OS_ANDROID) || defined(OS_IOS) |
51 #if defined(SPDY_PROXY_AUTH_VALUE) | 53 #if defined(SPDY_PROXY_AUTH_VALUE) |
52 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings. h" | 54 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings. h" |
53 #endif | 55 #endif |
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
515 request_interceptors.Pass(), | 517 request_interceptors.Pass(), |
516 profile_params->protocol_handler_interceptor.Pass(), | 518 profile_params->protocol_handler_interceptor.Pass(), |
517 network_delegate(), | 519 network_delegate(), |
518 ftp_factory_.get()); | 520 ftp_factory_.get()); |
519 main_context->set_job_factory(main_job_factory_.get()); | 521 main_context->set_job_factory(main_job_factory_.get()); |
520 | 522 |
521 #if defined(ENABLE_EXTENSIONS) | 523 #if defined(ENABLE_EXTENSIONS) |
522 InitializeExtensionsRequestContext(profile_params); | 524 InitializeExtensionsRequestContext(profile_params); |
523 #endif | 525 #endif |
524 | 526 |
527 // Setup the SDCHManager for this profile. | |
528 sdch_manager_.reset(new net::SdchManager); | |
529 sdch_manager_->set_sdch_fetcher( | |
530 new SdchDictionaryFetcher( | |
531 sdch_manager_.get(), | |
532 // SdchDictionaryFetcher takes a reference to the Getter, and | |
533 // hence implicitly takes ownership. | |
534 new net::TrivialURLRequestContextGetter( | |
mmenke
2014/06/12 16:48:31
This makes me sad, but doing something nicer seems
Randy Smith (Not in Mondays)
2014/06/12 18:06:40
I chatted with Will as to whether or not this shou
mmenke
2014/06/12 18:11:16
Actually, I'd be fine with using the real main req
| |
535 main_context, | |
536 content::BrowserThread::GetMessageLoopProxyForThread( | |
537 content::BrowserThread::IO)))); | |
mmenke
2014/06/12 16:48:31
Shouldn't you be calling main_context.set_sdch_man
mmenke
2014/06/12 16:48:31
What about the OTR profile? It would end up using
Randy Smith (Not in Mondays)
2014/06/12 18:06:39
Tricky question. I think the answer for this CL i
Randy Smith (Not in Mondays)
2014/06/12 18:06:39
Yikes. Thank you. Yes. (And I won't land withou
| |
538 | |
525 // Create a media request context based on the main context, but using a | 539 // Create a media request context based on the main context, but using a |
526 // media cache. It shares the same job factory as the main context. | 540 // media cache. It shares the same job factory as the main context. |
527 StoragePartitionDescriptor details(profile_path_, false); | 541 StoragePartitionDescriptor details(profile_path_, false); |
528 media_request_context_.reset(InitializeMediaRequestContext(main_context, | 542 media_request_context_.reset(InitializeMediaRequestContext(main_context, |
529 details)); | 543 details)); |
530 | 544 |
531 if (IsDomainReliabilityMonitoringEnabled()) { | 545 if (IsDomainReliabilityMonitoringEnabled()) { |
532 domain_reliability_monitor_.reset( | 546 domain_reliability_monitor_.reset( |
533 new domain_reliability::DomainReliabilityMonitor( | 547 new domain_reliability::DomainReliabilityMonitor( |
534 main_context, kDomainReliabilityUploadReporterString)); | 548 main_context, kDomainReliabilityUploadReporterString)); |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
774 domain_reliability::DomainReliabilityClearMode mode, | 788 domain_reliability::DomainReliabilityClearMode mode, |
775 const base::Closure& completion) { | 789 const base::Closure& completion) { |
776 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 790 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
777 DCHECK(initialized()); | 791 DCHECK(initialized()); |
778 | 792 |
779 if (domain_reliability_monitor_) | 793 if (domain_reliability_monitor_) |
780 domain_reliability_monitor_->ClearBrowsingData(mode); | 794 domain_reliability_monitor_->ClearBrowsingData(mode); |
781 | 795 |
782 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, completion); | 796 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, completion); |
783 } | 797 } |
OLD | NEW |