#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
-#include "chrome/browser/extensions/extension_protocols.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/net/chrome_net_log.h"
#include "chrome/browser/net/chrome_network_delegate.h"
#include "chrome/browser/net/connect_interceptor.h"
#include "chrome/browser/net/cookie_store_util.h"
-#include "chrome/browser/net/http_server_properties_manager.h"
+#include "chrome/browser/net/http_server_properties_manager_factory.h"
#include "chrome/browser/net/predictor.h"
-#include "chrome/browser/net/sqlite_server_bound_cert_store.h"
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h"
+#include "chrome/browser/net/sqlite_channel_id_store.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
+#include "components/domain_reliability/monitor.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/cookie_store_factory.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/resource_context.h"
#include "content/public/browser/storage_partition.h"
+#include "extensions/browser/extension_protocols.h"
#include "extensions/common/constants.h"
#include "net/base/cache_type.h"
+#include "net/base/sdch_dictionary_fetcher.h"
+#include "net/base/sdch_manager.h"
#include "net/ftp/ftp_network_layer.h"
#include "net/http/http_cache.h"
-#include "net/ssl/server_bound_cert_service.h"
-#include "net/url_request/protocol_intercept_job_factory.h"
+#include "net/http/http_server_properties_manager.h"
+#include "net/ssl/channel_id_service.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "webkit/browser/quota/special_storage_policy.h"
-#if defined(OS_ANDROID) || defined(OS_IOS)
-#include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings.h"
-#endif
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_protocol.h"
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h"
+#include "components/data_reduction_proxy/common/data_reduction_proxy_pref_names.h"
+#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
namespace {
net::BackendType ChooseCacheBackendType() {
+#if defined(OS_ANDROID)
+ return net::CACHE_BACKEND_SIMPLE;
+#else
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kUseSimpleCacheBackend)) {
const std::string opt_value =
}
const std::string experiment_name =
base::FieldTrialList::FindFullName("SimpleCacheTrial");
-#if defined(OS_ANDROID)
- if (experiment_name == "ExperimentNo" ||
- experiment_name == "ExperimentControl") {
- return net::CACHE_BACKEND_BLOCKFILE;
- }
- return net::CACHE_BACKEND_SIMPLE;
-#else
if (experiment_name == "ExperimentYes" ||
experiment_name == "ExperimentYes2") {
return net::CACHE_BACKEND_SIMPLE;
} // namespace
using content::BrowserThread;
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+using data_reduction_proxy::DataReductionProxyParams;
+#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
ProfileImplIOData::Handle::Handle(Profile* profile)
: io_data_(new ProfileImplIOData),
#if defined(OS_CHROMEOS)
save_prefs = !chromeos::ProfileHelper::IsSigninProfile(profile_);
#endif
- if (save_prefs) {
- io_data_->predictor_->SaveStateForNextStartupAndTrim(
- profile_->GetPrefs());
- }
+ if (save_prefs)
+ io_data_->predictor_->SaveStateForNextStartupAndTrim();
io_data_->predictor_->ShutdownOnUIThread();
}
if (io_data_->http_server_properties_manager_)
- io_data_->http_server_properties_manager_->ShutdownOnUIThread();
+ io_data_->http_server_properties_manager_->ShutdownOnPrefThread();
+
+ ChromeURLRequestContextGetterMap::iterator iter;
+
+ iter = isolated_media_request_context_getter_map_.begin();
+ for (; iter != isolated_media_request_context_getter_map_.end(); ++iter)
+ iter->second->Invalidate();
+
+ iter = app_request_context_getter_map_.begin();
+ for (; iter != app_request_context_getter_map_.end(); ++iter)
+ iter->second->Invalidate();
+
+ if (extensions_request_context_getter_)
+ extensions_request_context_getter_->Invalidate();
+
+ if (media_request_context_getter_)
+ media_request_context_getter_->Invalidate();
+
+ if (main_request_context_getter_)
+ main_request_context_getter_->Invalidate();
+
io_data_->ShutdownOnUIThread();
}
void ProfileImplIOData::Handle::Init(
const base::FilePath& cookie_path,
- const base::FilePath& server_bound_cert_path,
+ const base::FilePath& channel_id_path,
const base::FilePath& cache_path,
int cache_max_size,
const base::FilePath& media_cache_path,
const base::FilePath& infinite_cache_path,
chrome_browser_net::Predictor* predictor,
content::CookieStoreConfig::SessionCookieMode session_cookie_mode,
- quota::SpecialStoragePolicy* special_storage_policy) {
+ quota::SpecialStoragePolicy* special_storage_policy,
+ scoped_ptr<domain_reliability::DomainReliabilityMonitor>
+ domain_reliability_monitor,
+ const base::Callback<void(bool)>& data_reduction_proxy_unavailable,
+ scoped_ptr<DataReductionProxyChromeConfigurator>
+ data_reduction_proxy_chrome_configurator,
+ scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
+ data_reduction_proxy_params) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!io_data_->lazy_params_);
DCHECK(predictor);
LazyParams* lazy_params = new LazyParams();
lazy_params->cookie_path = cookie_path;
- lazy_params->server_bound_cert_path = server_bound_cert_path;
+ lazy_params->channel_id_path = channel_id_path;
lazy_params->cache_path = cache_path;
lazy_params->cache_max_size = cache_max_size;
lazy_params->media_cache_path = media_cache_path;
io_data_->app_media_cache_max_size_ = media_cache_max_size;
io_data_->predictor_.reset(predictor);
+ io_data_->domain_reliability_monitor_ = domain_reliability_monitor.Pass();
io_data_->InitializeMetricsEnabledStateOnUIThread();
+
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+ io_data_->data_reduction_proxy_unavailable_callback_ =
+ data_reduction_proxy_unavailable;
+ io_data_->data_reduction_proxy_chrome_configurator_ =
+ data_reduction_proxy_chrome_configurator.Pass();
+ io_data_->data_reduction_proxy_params_ =
+ data_reduction_proxy_params.Pass();
+#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
}
content::ResourceContext*
scoped_refptr<ChromeURLRequestContextGetter>
ProfileImplIOData::Handle::CreateMainRequestContextGetter(
content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors,
PrefService* local_state,
IOThread* io_thread) const {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
LazyInitialize();
DCHECK(!main_request_context_getter_.get());
main_request_context_getter_ = ChromeURLRequestContextGetter::Create(
- profile_, io_data_, protocol_handlers);
+ profile_, io_data_, protocol_handlers, request_interceptors.Pass());
io_data_->predictor_
->InitNetworkPredictor(profile_->GetPrefs(),
local_state,
io_thread,
- main_request_context_getter_.get());
+ main_request_context_getter_.get(),
+ io_data_);
content::NotificationService::current()->Notify(
chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED,
ProfileImplIOData::Handle::CreateIsolatedAppRequestContextGetter(
const base::FilePath& partition_path,
bool in_memory,
- content::ProtocolHandlerMap* protocol_handlers) const {
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors) const {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// Check that the partition_path is not the same as the base profile path. We
// expect isolated partition, which will never go to the default profile path.
scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
protocol_handler_interceptor(
- ProtocolHandlerRegistryFactory::GetForProfile(profile_)->
+ ProtocolHandlerRegistryFactory::GetForBrowserContext(profile_)->
CreateJobInterceptorFactory());
ChromeURLRequestContextGetter* context =
ChromeURLRequestContextGetter::CreateForIsolatedApp(
- profile_, io_data_, descriptor,
+ profile_,
+ io_data_,
+ descriptor,
protocol_handler_interceptor.Pass(),
- protocol_handlers);
+ protocol_handlers,
+ request_interceptors.Pass());
app_request_context_getter_map_[descriptor] = context;
return context;
return context;
}
+DevToolsNetworkController*
+ProfileImplIOData::Handle::GetDevToolsNetworkController() const {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ return io_data_->network_controller();
+}
+
void ProfileImplIOData::Handle::ClearNetworkingHistorySince(
base::Time time,
const base::Closure& completion) {
initialized_ = true;
PrefService* pref_service = profile_->GetPrefs();
io_data_->http_server_properties_manager_ =
- new chrome_browser_net::HttpServerPropertiesManager(pref_service);
+ chrome_browser_net::HttpServerPropertiesManagerFactory::CreateManager(
+ pref_service);
io_data_->set_http_server_properties(
scoped_ptr<net::HttpServerProperties>(
io_data_->http_server_properties_manager_));
io_data_->safe_browsing_enabled()->MoveToThread(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
#endif
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+ io_data_->data_reduction_proxy_enabled()->Init(
+ data_reduction_proxy::prefs::kDataReductionProxyEnabled, pref_service);
+ io_data_->data_reduction_proxy_enabled()->MoveToThread(
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
+#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
io_data_->InitializeOnUIThread(profile_);
}
ProfileImplIOData::LazyParams::~LazyParams() {}
ProfileImplIOData::ProfileImplIOData()
- : ProfileIOData(false),
+ : ProfileIOData(Profile::REGULAR_PROFILE),
http_server_properties_manager_(NULL),
app_cache_max_size_(0),
app_media_cache_max_size_(0) {
}
ProfileImplIOData::~ProfileImplIOData() {
+ if (initialized())
+ network_delegate()->set_domain_reliability_monitor(NULL);
+
DestroyResourceContext();
if (media_request_context_)
void ProfileImplIOData::InitializeInternal(
ProfileParams* profile_params,
- content::ProtocolHandlerMap* protocol_handlers) const {
- ChromeURLRequestContext* main_context = main_request_context();
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors) const {
+ net::URLRequestContext* main_context = main_request_context();
IOThread* const io_thread = profile_params->io_thread;
IOThread::Globals* const io_thread_globals = io_thread->globals();
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+ data_reduction_proxy_auth_request_handler_.reset(
+ new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
+ DataReductionProxyChromeSettings::GetClient(),
+ DataReductionProxyChromeSettings::GetBuildAndPatchNumber(),
+ data_reduction_proxy_params_.get(),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
+ data_reduction_proxy_usage_stats_.reset(
+ new data_reduction_proxy::DataReductionProxyUsageStats(
+ data_reduction_proxy_params_.get(),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)));
+ data_reduction_proxy_usage_stats_->set_unavailable_callback(
+ data_reduction_proxy_unavailable_callback_);
+
+
+ network_delegate()->set_data_reduction_proxy_params(
+ data_reduction_proxy_params_.get());
+ network_delegate()->set_data_reduction_proxy_usage_stats(
+ data_reduction_proxy_usage_stats_.get());
+ network_delegate()->set_data_reduction_proxy_auth_request_handler(
+ data_reduction_proxy_auth_request_handler_.get());
+ network_delegate()->set_on_resolve_proxy_handler(
+ base::Bind(data_reduction_proxy::OnResolveProxyHandler));
+ network_delegate()->set_proxy_config_getter(
+ base::Bind(
+ &DataReductionProxyChromeConfigurator::GetProxyConfigOnIO,
+ base::Unretained(data_reduction_proxy_chrome_configurator_.get())));
+#endif // defined(SPDY_PROXY_AUTH_ORIGIN)
+
network_delegate()->set_predictor(predictor_.get());
// Initialize context members.
ApplyProfileParamsToContext(main_context);
if (http_server_properties_manager_)
- http_server_properties_manager_->InitializeOnIOThread();
+ http_server_properties_manager_->InitializeOnNetworkThread();
main_context->set_transport_security_state(transport_security_state());
main_context->set_proxy_service(proxy_service());
scoped_refptr<net::CookieStore> cookie_store = NULL;
- net::ServerBoundCertService* server_bound_cert_service = NULL;
+ net::ChannelIDService* channel_id_service = NULL;
if (chrome_browser_net::ShouldUseInMemoryCookiesAndCache()) {
// Don't use existing cookies and use an in-memory store.
using content::CookieStoreConfig;
CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
NULL,
profile_params->cookie_monster_delegate.get()));
- // Don't use existing server-bound certs and use an in-memory store.
- server_bound_cert_service = new net::ServerBoundCertService(
- new net::DefaultServerBoundCertStore(NULL),
+ // Don't use existing channel ids and use an in-memory store.
+ channel_id_service = new net::ChannelIDService(
+ new net::DefaultChannelIDStore(NULL),
base::WorkerPool::GetTaskRunner(true));
}
main_context->set_cookie_store(cookie_store.get());
// Setup server bound cert service.
- if (!server_bound_cert_service) {
- DCHECK(!lazy_params_->server_bound_cert_path.empty());
+ if (!channel_id_service) {
+ DCHECK(!lazy_params_->channel_id_path.empty());
- scoped_refptr<SQLiteServerBoundCertStore> server_bound_cert_db =
- new SQLiteServerBoundCertStore(
- lazy_params_->server_bound_cert_path,
+ scoped_refptr<SQLiteChannelIDStore> channel_id_db =
+ new SQLiteChannelIDStore(
+ lazy_params_->channel_id_path,
BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
BrowserThread::GetBlockingPool()->GetSequenceToken()),
lazy_params_->special_storage_policy.get());
- server_bound_cert_service = new net::ServerBoundCertService(
- new net::DefaultServerBoundCertStore(server_bound_cert_db.get()),
+ channel_id_service = new net::ChannelIDService(
+ new net::DefaultChannelIDStore(channel_id_db.get()),
base::WorkerPool::GetTaskRunner(true));
}
- set_server_bound_cert_service(server_bound_cert_service);
- main_context->set_server_bound_cert_service(server_bound_cert_service);
+ set_channel_id_service(channel_id_service);
+ main_context->set_channel_id_service(channel_id_service);
net::HttpCache::DefaultBackend* main_backend =
new net::HttpCache::DefaultBackend(
lazy_params_->cache_max_size,
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)
.get());
- net::HttpNetworkSession::Params network_session_params;
- PopulateNetworkSessionParams(profile_params, &network_session_params);
- net::HttpCache* main_cache = new net::HttpCache(
- network_session_params, main_backend);
+ scoped_ptr<net::HttpCache> main_cache = CreateMainHttpFactory(
+ profile_params, main_backend);
main_cache->InitializeInfiniteCache(lazy_params_->infinite_cache_path);
-#if defined(OS_ANDROID) || defined(OS_IOS)
- DataReductionProxySettings::InitDataReductionProxySession(
- main_cache->GetSession());
-#endif
-
if (chrome_browser_net::ShouldUseInMemoryCookiesAndCache()) {
main_cache->set_mode(
chrome_browser_net::IsCookieRecordMode() ?
net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
}
- main_http_factory_.reset(main_cache);
- main_context->set_http_transaction_factory(main_cache);
+ main_http_factory_.reset(main_cache.release());
+ main_context->set_http_transaction_factory(main_http_factory_.get());
#if !defined(DISABLE_FTP_SUPPORT)
ftp_factory_.reset(
InstallProtocolHandlers(main_job_factory.get(), protocol_handlers);
main_job_factory_ = SetUpJobFactoryDefaults(
main_job_factory.Pass(),
+ request_interceptors.Pass(),
profile_params->protocol_handler_interceptor.Pass(),
network_delegate(),
ftp_factory_.get());
InitializeExtensionsRequestContext(profile_params);
#endif
+ // Setup the SDCHManager for this profile.
+ sdch_manager_.reset(new net::SdchManager);
+ sdch_manager_->set_sdch_fetcher(
+ new net::SdchDictionaryFetcher(
+ sdch_manager_.get(),
+ // SdchDictionaryFetcher takes a reference to the Getter, and
+ // hence implicitly takes ownership.
+ new net::TrivialURLRequestContextGetter(
+ main_context,
+ content::BrowserThread::GetMessageLoopProxyForThread(
+ content::BrowserThread::IO))));
+ main_context->set_sdch_manager(sdch_manager_.get());
+
// Create a media request context based on the main context, but using a
// media cache. It shares the same job factory as the main context.
StoragePartitionDescriptor details(profile_path_, false);
media_request_context_.reset(InitializeMediaRequestContext(main_context,
details));
+ if (domain_reliability_monitor_) {
+ domain_reliability_monitor_->Init(
+ main_context,
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
+ domain_reliability_monitor_->AddBakedInConfigs();
+ network_delegate()->set_domain_reliability_monitor(
+ domain_reliability_monitor_.get());
+ }
+
lazy_params_.reset();
}
void ProfileImplIOData::
InitializeExtensionsRequestContext(ProfileParams* profile_params) const {
- ChromeURLRequestContext* extensions_context = extensions_request_context();
+ net::URLRequestContext* extensions_context = extensions_request_context();
IOThread* const io_thread = profile_params->io_thread;
IOThread::Globals* const io_thread_globals = io_thread->globals();
ApplyProfileParamsToContext(extensions_context);
net::CookieStore* extensions_cookie_store =
content::CreateCookieStore(cookie_config);
// Enable cookies for devtools and extension URLs.
- const char* schemes[] = {chrome::kChromeDevToolsScheme,
- extensions::kExtensionScheme};
- extensions_cookie_store->GetCookieMonster()->SetCookieableSchemes(schemes, 2);
+ const char* const schemes[] = {
+ content::kChromeDevToolsScheme,
+ extensions::kExtensionScheme
+ };
+ extensions_cookie_store->GetCookieMonster()->SetCookieableSchemes(
+ schemes, arraysize(schemes));
extensions_context->set_cookie_store(extensions_cookie_store);
scoped_ptr<net::URLRequestJobFactoryImpl> extensions_job_factory(
// SetUpJobFactory() to get this effect.
extensions_job_factory_ = SetUpJobFactoryDefaults(
extensions_job_factory.Pass(),
+ content::URLRequestInterceptorScopedVector(),
scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>(),
NULL,
ftp_factory_.get());
extensions_context->set_job_factory(extensions_job_factory_.get());
}
-ChromeURLRequestContext*
-ProfileImplIOData::InitializeAppRequestContext(
- ChromeURLRequestContext* main_context,
+net::URLRequestContext* ProfileImplIOData::InitializeAppRequestContext(
+ net::URLRequestContext* main_context,
const StoragePartitionDescriptor& partition_descriptor,
scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
protocol_handler_interceptor,
- content::ProtocolHandlerMap* protocol_handlers) const {
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors) const {
// Copy most state from the main context.
AppRequestContext* context = new AppRequestContext();
context->CopyFrom(main_context);
}
net::HttpNetworkSession* main_network_session =
main_http_factory_->GetSession();
- net::HttpCache* app_http_cache =
- new net::HttpCache(main_network_session, app_backend);
+ scoped_ptr<net::HttpCache> app_http_cache =
+ CreateHttpFactory(main_network_session, app_backend);
scoped_refptr<net::CookieStore> cookie_store = NULL;
if (partition_descriptor.in_memory) {
// Transfer ownership of the cookies and cache to AppRequestContext.
context->SetCookieStore(cookie_store.get());
context->SetHttpTransactionFactory(
- scoped_ptr<net::HttpTransactionFactory>(app_http_cache));
+ scoped_ptr<net::HttpTransactionFactory>(
+ app_http_cache.PassAs<net::HttpTransactionFactory>()));
scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
new net::URLRequestJobFactoryImpl());
InstallProtocolHandlers(job_factory.get(), protocol_handlers);
scoped_ptr<net::URLRequestJobFactory> top_job_factory(
- SetUpJobFactoryDefaults(
- job_factory.Pass(), protocol_handler_interceptor.Pass(),
- network_delegate(),
- ftp_factory_.get()));
+ SetUpJobFactoryDefaults(job_factory.Pass(),
+ request_interceptors.Pass(),
+ protocol_handler_interceptor.Pass(),
+ network_delegate(),
+ ftp_factory_.get()));
context->SetJobFactory(top_job_factory.Pass());
return context;
}
-ChromeURLRequestContext*
+net::URLRequestContext*
ProfileImplIOData::InitializeMediaRequestContext(
- ChromeURLRequestContext* original_context,
+ net::URLRequestContext* original_context,
const StoragePartitionDescriptor& partition_descriptor) const {
// Copy most state from the original context.
MediaRequestContext* context = new MediaRequestContext();
.get());
net::HttpNetworkSession* main_network_session =
main_http_factory_->GetSession();
- scoped_ptr<net::HttpTransactionFactory> media_http_cache(
- new net::HttpCache(main_network_session, media_backend));
+ scoped_ptr<net::HttpCache> media_http_cache =
+ CreateHttpFactory(main_network_session, media_backend);
// Transfer ownership of the cache to MediaRequestContext.
- context->SetHttpTransactionFactory(media_http_cache.Pass());
+ context->SetHttpTransactionFactory(
+ media_http_cache.PassAs<net::HttpTransactionFactory>());
// Note that we do not create a new URLRequestJobFactory because
// the media context should behave exactly like its parent context
return context;
}
-ChromeURLRequestContext*
+net::URLRequestContext*
ProfileImplIOData::AcquireMediaRequestContext() const {
DCHECK(media_request_context_);
return media_request_context_.get();
}
-ChromeURLRequestContext*
-ProfileImplIOData::AcquireIsolatedAppRequestContext(
- ChromeURLRequestContext* main_context,
+net::URLRequestContext* ProfileImplIOData::AcquireIsolatedAppRequestContext(
+ net::URLRequestContext* main_context,
const StoragePartitionDescriptor& partition_descriptor,
scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
protocol_handler_interceptor,
- content::ProtocolHandlerMap* protocol_handlers) const {
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors) const {
// We create per-app contexts on demand, unlike the others above.
- ChromeURLRequestContext* app_request_context =
- InitializeAppRequestContext(main_context, partition_descriptor,
+ net::URLRequestContext* app_request_context =
+ InitializeAppRequestContext(main_context,
+ partition_descriptor,
protocol_handler_interceptor.Pass(),
- protocol_handlers);
+ protocol_handlers,
+ request_interceptors.Pass());
DCHECK(app_request_context);
return app_request_context;
}
-ChromeURLRequestContext*
+net::URLRequestContext*
ProfileImplIOData::AcquireIsolatedMediaRequestContext(
- ChromeURLRequestContext* app_context,
+ net::URLRequestContext* app_context,
const StoragePartitionDescriptor& partition_descriptor) const {
// We create per-app media contexts on demand, unlike the others above.
- ChromeURLRequestContext* media_request_context =
+ net::URLRequestContext* media_request_context =
InitializeMediaRequestContext(app_context, partition_descriptor);
DCHECK(media_request_context);
return media_request_context;
projects / platform / framework / web / crosswalk.git / blobdiff