#include <vector>
+#include "android_webview/browser/aw_browser_context.h"
#include "android_webview/browser/aw_content_browser_client.h"
#include "android_webview/browser/aw_request_interceptor.h"
#include "android_webview/browser/net/aw_network_delegate.h"
#include "android_webview/browser/net/aw_url_request_job_factory.h"
#include "android_webview/browser/net/init_native_callback.h"
-#include "android_webview/common/aw_switches.h"
+#include "android_webview/common/aw_content_client.h"
#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
+#include "base/threading/worker_pool.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.h"
+#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/cookie_store_factory.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
#include "net/base/cache_type.h"
+#include "net/base/net_log.h"
#include "net/cookies/cookie_store.h"
#include "net/dns/mapped_host_resolver.h"
#include "net/http/http_cache.h"
#include "net/http/http_stream_factory.h"
#include "net/proxy/proxy_service.h"
+#include "net/socket/next_proto.h"
+#include "net/ssl/default_channel_id_store.h"
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/file_protocol_handler.h"
-#include "net/url_request/protocol_intercept_job_factory.h"
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_intercepting_job_factory.h"
+#include "net/url_request/url_request_interceptor.h"
using content::BrowserThread;
+using data_reduction_proxy::DataReductionProxySettings;
namespace android_webview {
void ApplyCmdlineOverridesToURLRequestContextBuilder(
net::URLRequestContextBuilder* builder) {
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kHostResolverRules)) {
// If hostname remappings were specified on the command-line, layer these
// rules on top of the real host resolver. This allows forwarding all
void ApplyCmdlineOverridesToNetworkSessionParams(
net::HttpNetworkSession::Params* params) {
int value;
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) {
base::StringToInt(command_line.GetSwitchValueASCII(
switches::kTestingFixedHttpPort), &value);
switches::kTestingFixedHttpsPort), &value);
params->testing_fixed_https_port = value;
}
+ if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) {
+ params->ignore_certificate_errors = true;
+ }
}
void PopulateNetworkSessionParams(
net::HttpNetworkSession::Params* params) {
params->host_resolver = context->host_resolver();
params->cert_verifier = context->cert_verifier();
- params->server_bound_cert_service = context->server_bound_cert_service();
+ params->channel_id_service = context->channel_id_service();
params->transport_security_state = context->transport_security_state();
params->proxy_service = context->proxy_service();
params->ssl_config_service = context->ssl_config_service();
params->network_delegate = context->network_delegate();
params->http_server_properties = context->http_server_properties();
params->net_log = context->net_log();
+ // TODO(sgurun) remove once crbug.com/329681 is fixed.
+ params->next_protos = net::NextProtosSpdy31();
+ params->use_alternate_protocols = true;
+
ApplyCmdlineOverridesToNetworkSessionParams(params);
}
scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
- content::ProtocolHandlerMap* protocol_handlers) {
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors) {
scoped_ptr<AwURLRequestJobFactory> aw_job_factory(new AwURLRequestJobFactory);
bool set_protocol = aw_job_factory->SetProtocolHandler(
- content::kFileScheme,
+ url::kFileScheme,
new net::FileProtocolHandler(
content::BrowserThread::GetBlockingPool()->
GetTaskRunnerWithShutdownBehavior(
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
- content::kDataScheme, new net::DataProtocolHandler());
+ url::kDataScheme, new net::DataProtocolHandler());
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
- chrome::kBlobScheme, (*protocol_handlers)[chrome::kBlobScheme].release());
+ url::kBlobScheme,
+ (*protocol_handlers)[url::kBlobScheme].release());
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
- content::kFileSystemScheme,
- (*protocol_handlers)[content::kFileSystemScheme].release());
+ url::kFileSystemScheme,
+ (*protocol_handlers)[url::kFileSystemScheme].release());
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
content::kChromeUIScheme,
DCHECK(set_protocol);
protocol_handlers->clear();
- // Create a chain of URLRequestJobFactories. The handlers will be invoked
- // in the order in which they appear in the protocol_handlers vector.
- typedef std::vector<net::URLRequestJobFactory::ProtocolHandler*>
- ProtocolHandlerVector;
- ProtocolHandlerVector protocol_interceptors;
-
// Note that even though the content:// scheme handler is created here,
// it cannot be used by child processes until access to it is granted via
// ChildProcessSecurityPolicy::GrantScheme(). This is done in
// AwContentBrowserClient.
- protocol_interceptors.push_back(
- CreateAndroidContentProtocolHandler().release());
- protocol_interceptors.push_back(
- CreateAndroidAssetFileProtocolHandler().release());
+ request_interceptors.push_back(
+ CreateAndroidContentRequestInterceptor().release());
+ request_interceptors.push_back(
+ CreateAndroidAssetFileRequestInterceptor().release());
// The AwRequestInterceptor must come after the content and asset file job
// factories. This for WebViewClassic compatibility where it was not
// possible to intercept resource loads to resolvable content:// and
// file:// URIs.
// This logical dependency is also the reason why the Content
- // ProtocolHandler has to be added as a ProtocolInterceptJobFactory rather
- // than via SetProtocolHandler.
- protocol_interceptors.push_back(new AwRequestInterceptor());
+ // URLRequestInterceptor has to be added as an interceptor rather than as a
+ // ProtocolHandler.
+ request_interceptors.push_back(new AwRequestInterceptor());
// The chain of responsibility will execute the handlers in reverse to the
// order in which the elements of the chain are created.
scoped_ptr<net::URLRequestJobFactory> job_factory(aw_job_factory.Pass());
- for (ProtocolHandlerVector::reverse_iterator
- i = protocol_interceptors.rbegin();
- i != protocol_interceptors.rend();
+ for (content::URLRequestInterceptorScopedVector::reverse_iterator i =
+ request_interceptors.rbegin();
+ i != request_interceptors.rend();
++i) {
- job_factory.reset(new net::ProtocolInterceptJobFactory(
+ job_factory.reset(new net::URLRequestInterceptingJobFactory(
job_factory.Pass(), make_scoped_ptr(*i)));
}
+ request_interceptors.weak_clear();
return job_factory.Pass();
}
} // namespace
AwURLRequestContextGetter::AwURLRequestContextGetter(
- const base::FilePath& partition_path, net::CookieStore* cookie_store)
- : partition_path_(partition_path),
+ const base::FilePath& cache_path, net::CookieStore* cookie_store,
+ scoped_ptr<data_reduction_proxy::DataReductionProxyConfigService>
+ config_service)
+ : cache_path_(cache_path),
cookie_store_(cookie_store),
- proxy_config_service_(net::ProxyService::CreateSystemProxyConfigService(
- GetNetworkTaskRunner(),
- NULL /* Ignored on Android */)) {
+ net_log_(new net::NetLog()) {
+ data_reduction_proxy_config_service_ = config_service.Pass();
// CreateSystemProxyConfigService for Android must be called on main thread.
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
}
DCHECK(!url_request_context_);
net::URLRequestContextBuilder builder;
- builder.set_user_agent(content::GetUserAgent(GURL()));
- builder.set_network_delegate(new AwNetworkDelegate());
+ builder.set_user_agent(GetUserAgent());
+ AwNetworkDelegate* aw_network_delegate = new AwNetworkDelegate();
+ builder.set_network_delegate(aw_network_delegate);
#if !defined(DISABLE_FTP_SUPPORT)
builder.set_ftp_enabled(false); // Android WebView does not support ftp yet.
#endif
- builder.set_proxy_config_service(proxy_config_service_.release());
+ DCHECK(data_reduction_proxy_config_service_.get());
+ // Android provides a local HTTP proxy that handles all the proxying.
+ // Create the proxy without a resolver since we rely on this local HTTP proxy.
+ // TODO(sgurun) is this behavior guaranteed through SDK?
+ builder.set_proxy_service(
+ net::ProxyService::CreateWithoutProxyResolver(
+ data_reduction_proxy_config_service_.release(),
+ net_log_.get()));
builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader(
AwContentBrowserClient::GetAcceptLangsImpl()));
+ builder.set_net_log(net_log_.get());
+ builder.set_channel_id_enabled(false);
ApplyCmdlineOverridesToURLRequestContextBuilder(&builder);
url_request_context_.reset(builder.Build());
// TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
net::HttpNetworkSession::Params network_session_params;
- net::BackendType cache_type = net::CACHE_BACKEND_SIMPLE;
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableSimpleCache)) {
- cache_type = net::CACHE_BACKEND_BLOCKFILE;
- }
PopulateNetworkSessionParams(url_request_context_.get(),
&network_session_params);
network_session_params,
new net::HttpCache::DefaultBackend(
net::DISK_CACHE,
- cache_type,
- partition_path_.Append(FILE_PATH_LITERAL("Cache")),
+ net::CACHE_BACKEND_SIMPLE,
+ cache_path_,
20 * 1024 * 1024, // 20M
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)));
+
+ AwBrowserContext* browser_context = AwBrowserContext::GetDefault();
+ DCHECK(browser_context);
+ DataReductionProxySettings* data_reduction_proxy_settings =
+ browser_context->GetDataReductionProxySettings();
+ DCHECK(data_reduction_proxy_settings);
+ data_reduction_proxy_auth_request_handler_.reset(
+ new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
+ data_reduction_proxy::Client::WEBVIEW_ANDROID,
+ data_reduction_proxy_settings->params(),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
+
+ // Compression statistics are not gathered for WebView, so
+ // DataReductionProxyStatisticsPrefs is not instantiated and passed to the
+ // network delegate.
+ aw_network_delegate->set_data_reduction_proxy_params(
+ data_reduction_proxy_settings->params());
+ aw_network_delegate->set_data_reduction_proxy_auth_request_handler(
+ data_reduction_proxy_auth_request_handler_.get());
+
main_http_factory_.reset(main_cache);
url_request_context_->set_http_transaction_factory(main_cache);
- url_request_context_->set_cookie_store(cookie_store_);
+ url_request_context_->set_cookie_store(cookie_store_.get());
- job_factory_ = CreateJobFactory(&protocol_handlers_);
- url_request_context_->set_job_factory(job_factory_.get());
+ job_factory_ = CreateJobFactory(&protocol_handlers_,
+ request_interceptors_.Pass());
- // TODO(sgurun) remove once crbug.com/329681 is fixed. Should be
- // called only once.
- net::HttpStreamFactory::EnableNpnSpdy31();
+ job_factory_.reset(new net::URLRequestInterceptingJobFactory(
+ job_factory_.Pass(), make_scoped_ptr(
+ new data_reduction_proxy::DataReductionProxyInterceptor(
+ data_reduction_proxy_settings->params(), NULL))));
+ url_request_context_->set_job_factory(job_factory_.get());
}
net::URLRequestContext* AwURLRequestContextGetter::GetURLRequestContext() {
return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
}
-void AwURLRequestContextGetter::SetProtocolHandlers(
- content::ProtocolHandlerMap* protocol_handlers) {
+void AwURLRequestContextGetter::SetHandlersAndInterceptors(
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors) {
std::swap(protocol_handlers_, *protocol_handlers);
+ request_interceptors_.swap(request_interceptors);
+}
+
+data_reduction_proxy::DataReductionProxyAuthRequestHandler*
+AwURLRequestContextGetter::GetDataReductionProxyAuthRequestHandler() const {
+ return data_reduction_proxy_auth_request_handler_.get();
+}
+
+net::NetLog* AwURLRequestContextGetter::GetNetLog() {
+ return net_log_.get();
+}
+
+void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) {
+ DCHECK(data_reduction_proxy_auth_request_handler_);
+ data_reduction_proxy_auth_request_handler_->InitAuthentication(key);
}
} // namespace android_webview
projects / platform / framework / web / crosswalk.git / blobdiff