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/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 12 matching lines...) Expand all Loading... | |
23 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
24 #include "chrome/common/chrome_constants.h" | 24 #include "chrome/common/chrome_constants.h" |
25 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
26 #include "chrome/common/pref_names.h" | 26 #include "chrome/common/pref_names.h" |
27 #include "chrome/common/url_constants.h" | 27 #include "chrome/common/url_constants.h" |
28 #include "content/public/browser/browser_thread.h" | 28 #include "content/public/browser/browser_thread.h" |
29 #include "content/public/browser/resource_context.h" | 29 #include "content/public/browser/resource_context.h" |
30 #include "net/base/server_bound_cert_service.h" | 30 #include "net/base/server_bound_cert_service.h" |
31 #include "net/ftp/ftp_network_layer.h" | 31 #include "net/ftp/ftp_network_layer.h" |
32 #include "net/http/http_cache.h" | 32 #include "net/http/http_cache.h" |
33 #include "net/url_request/data_protocol_handler.h" | |
33 #include "net/url_request/url_request_job_factory.h" | 34 #include "net/url_request/url_request_job_factory.h" |
34 #include "webkit/quota/special_storage_policy.h" | 35 #include "webkit/quota/special_storage_policy.h" |
35 | 36 |
36 using content::BrowserThread; | 37 using content::BrowserThread; |
37 | 38 |
38 ProfileImplIOData::Handle::Handle(Profile* profile) | 39 ProfileImplIOData::Handle::Handle(Profile* profile) |
39 : io_data_(new ProfileImplIOData), | 40 : io_data_(new ProfileImplIOData), |
40 profile_(profile), | 41 profile_(profile), |
41 initialized_(false) { | 42 initialized_(false) { |
42 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 43 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
441 media_request_job_factory_.reset(new net::URLRequestJobFactory); | 442 media_request_job_factory_.reset(new net::URLRequestJobFactory); |
442 extensions_job_factory_.reset(new net::URLRequestJobFactory); | 443 extensions_job_factory_.reset(new net::URLRequestJobFactory); |
443 | 444 |
444 net::URLRequestJobFactory* job_factories[3]; | 445 net::URLRequestJobFactory* job_factories[3]; |
445 job_factories[0] = main_job_factory_.get(); | 446 job_factories[0] = main_job_factory_.get(); |
446 job_factories[1] = media_request_job_factory_.get(); | 447 job_factories[1] = media_request_job_factory_.get(); |
447 job_factories[2] = extensions_job_factory_.get(); | 448 job_factories[2] = extensions_job_factory_.get(); |
448 | 449 |
449 for (int i = 0; i < 3; i++) { | 450 for (int i = 0; i < 3; i++) { |
450 SetUpJobFactoryDefaults(job_factories[i]); | 451 SetUpJobFactoryDefaults(job_factories[i]); |
452 job_factories[i]->SetProtocolHandler(chrome::kDataScheme, | |
erikwright (departed)
2012/07/13 15:11:15
Should this go in SetUpJobFactoryDefaults?
shalev
2012/07/17 19:39:48
Done.
| |
453 new net::DataProtocolHandler()); | |
451 job_factories[i]->AddInterceptor( | 454 job_factories[i]->AddInterceptor( |
452 new chrome_browser_net::ConnectInterceptor(predictor_.get())); | 455 new chrome_browser_net::ConnectInterceptor(predictor_.get())); |
453 } | 456 } |
454 | 457 |
455 main_context->set_job_factory(main_job_factory_.get()); | 458 main_context->set_job_factory(main_job_factory_.get()); |
456 media_request_context_->set_job_factory(media_request_job_factory_.get()); | 459 media_request_context_->set_job_factory(media_request_job_factory_.get()); |
457 extensions_context->set_job_factory(extensions_job_factory_.get()); | 460 extensions_context->set_job_factory(extensions_job_factory_.get()); |
458 | 461 |
459 lazy_params_.reset(); | 462 lazy_params_.reset(); |
460 } | 463 } |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
543 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread( | 546 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread( |
544 base::Time time) { | 547 base::Time time) { |
545 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 548 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
546 LazyInitialize(); | 549 LazyInitialize(); |
547 | 550 |
548 DCHECK(transport_security_state()); | 551 DCHECK(transport_security_state()); |
549 transport_security_state()->DeleteSince(time); | 552 transport_security_state()->DeleteSince(time); |
550 DCHECK(http_server_properties_manager()); | 553 DCHECK(http_server_properties_manager()); |
551 http_server_properties_manager()->Clear(); | 554 http_server_properties_manager()->Clear(); |
552 } | 555 } |
OLD | NEW |