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

Side by Side Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 10700117: Replaced static URLRequestFileJob factory with non-static protocol handler for File jobs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Made changes suggested by reviewers Created 8 years, 4 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 | Annotate | Revision Log
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/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"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/threading/worker_pool.h" 12 #include "base/threading/worker_pool.h"
13 #include "chrome/browser/io_thread.h" 13 #include "chrome/browser/io_thread.h"
14 #include "chrome/browser/net/chrome_net_log.h" 14 #include "chrome/browser/net/chrome_net_log.h"
15 #include "chrome/browser/net/chrome_network_delegate.h" 15 #include "chrome/browser/net/chrome_network_delegate.h"
16 #include "chrome/browser/net/clear_on_exit_policy.h" 16 #include "chrome/browser/net/clear_on_exit_policy.h"
17 #include "chrome/browser/net/connect_interceptor.h" 17 #include "chrome/browser/net/connect_interceptor.h"
18 #include "chrome/browser/net/http_server_properties_manager.h" 18 #include "chrome/browser/net/http_server_properties_manager.h"
19 #include "chrome/browser/net/predictor.h" 19 #include "chrome/browser/net/predictor.h"
20 #include "chrome/browser/net/sqlite_persistent_cookie_store.h" 20 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
21 #include "chrome/browser/net/sqlite_server_bound_cert_store.h" 21 #include "chrome/browser/net/sqlite_server_bound_cert_store.h"
22 #include "chrome/browser/prefs/pref_member.h" 22 #include "chrome/browser/prefs/pref_member.h"
23 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
24 #include "chrome/common/chrome_constants.h" 25 #include "chrome/common/chrome_constants.h"
25 #include "chrome/common/chrome_notification_types.h" 26 #include "chrome/common/chrome_notification_types.h"
26 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
28 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
29 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/notification_service.h" 31 #include "content/public/browser/notification_service.h"
31 #include "content/public/browser/resource_context.h" 32 #include "content/public/browser/resource_context.h"
32 #include "net/base/server_bound_cert_service.h" 33 #include "net/base/server_bound_cert_service.h"
33 #include "net/ftp/ftp_network_layer.h" 34 #include "net/ftp/ftp_network_layer.h"
34 #include "net/http/http_cache.h" 35 #include "net/http/http_cache.h"
36 #include "net/url_request/file_protocol_handler.h"
35 #include "net/url_request/ftp_protocol_handler.h" 37 #include "net/url_request/ftp_protocol_handler.h"
36 #include "net/url_request/url_request_job_factory.h" 38 #include "net/url_request/url_request_job_factory.h"
37 #include "webkit/quota/special_storage_policy.h" 39 #include "webkit/quota/special_storage_policy.h"
38 40
39 using content::BrowserThread; 41 using content::BrowserThread;
40 42
41 ProfileImplIOData::Handle::Handle(Profile* profile) 43 ProfileImplIOData::Handle::Handle(Profile* profile)
42 : io_data_(new ProfileImplIOData), 44 : io_data_(new ProfileImplIOData),
43 profile_(profile), 45 profile_(profile),
44 initialized_(false) { 46 initialized_(false) {
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 main_context->set_ftp_transaction_factory(ftp_factory_.get()); 444 main_context->set_ftp_transaction_factory(ftp_factory_.get());
443 media_request_context_->set_ftp_transaction_factory(ftp_factory_.get()); 445 media_request_context_->set_ftp_transaction_factory(ftp_factory_.get());
444 446
445 main_context->set_chrome_url_data_manager_backend( 447 main_context->set_chrome_url_data_manager_backend(
446 chrome_url_data_manager_backend()); 448 chrome_url_data_manager_backend());
447 449
448 main_job_factory_.reset(new net::URLRequestJobFactory); 450 main_job_factory_.reset(new net::URLRequestJobFactory);
449 media_request_job_factory_.reset(new net::URLRequestJobFactory); 451 media_request_job_factory_.reset(new net::URLRequestJobFactory);
450 extensions_job_factory_.reset(new net::URLRequestJobFactory); 452 extensions_job_factory_.reset(new net::URLRequestJobFactory);
451 453
454 int set_protocol = main_job_factory_->SetProtocolHandler(
455 chrome::kFileScheme, new net::FileProtocolHandler(network_delegate()));
456 DCHECK(set_protocol);
457 set_protocol = media_request_job_factory_->SetProtocolHandler(
458 chrome::kFileScheme, new net::FileProtocolHandler(network_delegate()));
459 DCHECK(set_protocol);
460 // TODO(shalev): Without a network_delegate this protocol handler will never
461 // handle file: requests, but as a side effect it makes
462 // job_factory::IsHandledProtocol return true, which prevents attempts to
463 // handle the protocol externally.
464 set_protocol = extensions_job_factory_->SetProtocolHandler(
465 chrome::kFileScheme, new net::FileProtocolHandler(NULL));
466 DCHECK(set_protocol);
467
468 set_protocol = main_job_factory_->SetProtocolHandler(
469 chrome::kChromeDevToolsScheme,
470 CreateDevToolsProtocolHandler(chrome_url_data_manager_backend(),
471 network_delegate()));
472 DCHECK(set_protocol);
473 set_protocol = media_request_job_factory_->SetProtocolHandler(
474 chrome::kChromeDevToolsScheme,
475 CreateDevToolsProtocolHandler(chrome_url_data_manager_backend(),
476 network_delegate()));
477 DCHECK(set_protocol);
478 set_protocol = extensions_job_factory_->SetProtocolHandler(
479 chrome::kChromeDevToolsScheme,
480 CreateDevToolsProtocolHandler(chrome_url_data_manager_backend(), NULL));
481 DCHECK(set_protocol);
mmenke 2012/08/16 14:54:31 Know that I argued the other way for the file:// s
shalev 2012/08/16 15:07:25 You're right. I will try to look at this soon and
482
452 net::URLRequestJobFactory* job_factories[3]; 483 net::URLRequestJobFactory* job_factories[3];
453 job_factories[0] = main_job_factory_.get(); 484 job_factories[0] = main_job_factory_.get();
454 job_factories[1] = media_request_job_factory_.get(); 485 job_factories[1] = media_request_job_factory_.get();
455 job_factories[2] = extensions_job_factory_.get(); 486 job_factories[2] = extensions_job_factory_.get();
456 487
457 net::FtpAuthCache* ftp_auth_caches[3]; 488 net::FtpAuthCache* ftp_auth_caches[3];
458 ftp_auth_caches[0] = main_context->ftp_auth_cache(); 489 ftp_auth_caches[0] = main_context->ftp_auth_cache();
459 ftp_auth_caches[1] = media_request_context_->ftp_auth_cache(); 490 ftp_auth_caches[1] = media_request_context_->ftp_auth_cache();
460 ftp_auth_caches[2] = extensions_context->ftp_auth_cache(); 491 ftp_auth_caches[2] = extensions_context->ftp_auth_cache();
461 492
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread( 613 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
583 base::Time time) { 614 base::Time time) {
584 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 615 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
585 LazyInitialize(); 616 LazyInitialize();
586 617
587 DCHECK(transport_security_state()); 618 DCHECK(transport_security_state());
588 transport_security_state()->DeleteSince(time); 619 transport_security_state()->DeleteSince(time);
589 DCHECK(http_server_properties_manager()); 620 DCHECK(http_server_properties_manager());
590 http_server_properties_manager()->Clear(); 621 http_server_properties_manager()->Clear();
591 } 622 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698