| Index: mojo/services/network/network_context.cc
|
| diff --git a/mojo/services/network/network_context.cc b/mojo/services/network/network_context.cc
|
| deleted file mode 100644
|
| index 22722388d26be076b89ab33873ee28f1c282b2a7..0000000000000000000000000000000000000000
|
| --- a/mojo/services/network/network_context.cc
|
| +++ /dev/null
|
| @@ -1,199 +0,0 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "mojo/services/network/network_context.h"
|
| -
|
| -#include <stddef.h>
|
| -#include <stdint.h>
|
| -
|
| -#include <algorithm>
|
| -#include <utility>
|
| -#include <vector>
|
| -
|
| -#include "base/base_paths.h"
|
| -#include "base/bind.h"
|
| -#include "base/command_line.h"
|
| -#include "base/logging.h"
|
| -#include "base/macros.h"
|
| -#include "base/path_service.h"
|
| -#include "base/strings/string_number_conversions.h"
|
| -#include "mojo/common/user_agent.h"
|
| -#include "mojo/services/network/url_loader_impl.h"
|
| -#include "net/cookies/cookie_monster.h"
|
| -#include "net/dns/host_resolver.h"
|
| -#include "net/dns/mapped_host_resolver.h"
|
| -#include "net/log/net_log_util.h"
|
| -#include "net/log/write_to_file_net_log_observer.h"
|
| -#include "net/proxy/proxy_service.h"
|
| -#include "net/ssl/channel_id_service.h"
|
| -#include "net/url_request/url_request_context.h"
|
| -#include "net/url_request/url_request_context_builder.h"
|
| -
|
| -namespace mojo {
|
| -
|
| -namespace {
|
| -// Applies the specified mapping rules when resolving hosts. Please see the
|
| -// comment of net::MappedHostResolver::AddRulesFromString() for rule format.
|
| -const char kHostResolverRules[] = "host-resolver-rules";
|
| -
|
| -// Ignores certificate-related errors.
|
| -const char kIgnoreCertificateErrors[] = "ignore-certificate-errors";
|
| -
|
| -// Logs network information to the specified file.
|
| -const char kLogNetLog[] = "log-net-log";
|
| -
|
| -// Allows for forcing socket connections to HTTP/HTTPS to use fixed ports.
|
| -const char kTestingFixedHttpPort[] = "testing-fixed-http-port";
|
| -const char kTestingFixedHttpsPort[] = "testing-fixed-https-port";
|
| -
|
| -uint16_t GetPortNumber(const base::CommandLine& command_line,
|
| - const base::StringPiece& switch_name) {
|
| - std::string port_str = command_line.GetSwitchValueASCII(switch_name);
|
| - unsigned port;
|
| - if (!base::StringToUint(port_str, &port) || port > 65535) {
|
| - LOG(ERROR) << "Invalid value for switch " << switch_name << ": '"
|
| - << port_str << "' is not a valid port number.";
|
| - return 0;
|
| - }
|
| - return static_cast<uint16_t>(port);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -class NetworkContext::MojoNetLog : public net::NetLog {
|
| - public:
|
| - MojoNetLog() {
|
| - const base::CommandLine* command_line =
|
| - base::CommandLine::ForCurrentProcess();
|
| - if (!command_line->HasSwitch(kLogNetLog))
|
| - return;
|
| -
|
| - base::FilePath log_path = command_line->GetSwitchValuePath(kLogNetLog);
|
| - base::ScopedFILE file;
|
| -#if defined(OS_WIN)
|
| - file.reset(_wfopen(log_path.value().c_str(), L"w"));
|
| -#elif defined(OS_POSIX)
|
| - file.reset(fopen(log_path.value().c_str(), "w"));
|
| -#endif
|
| - if (!file) {
|
| - LOG(ERROR) << "Could not open file " << log_path.value()
|
| - << " for net logging";
|
| - } else {
|
| - write_to_file_observer_.reset(new net::WriteToFileNetLogObserver());
|
| - write_to_file_observer_->set_capture_mode(
|
| - net::NetLogCaptureMode::IncludeCookiesAndCredentials());
|
| - write_to_file_observer_->StartObserving(this, std::move(file), nullptr,
|
| - nullptr);
|
| - }
|
| - }
|
| -
|
| - ~MojoNetLog() override {
|
| - if (write_to_file_observer_)
|
| - write_to_file_observer_->StopObserving(nullptr);
|
| - }
|
| -
|
| - private:
|
| - scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(MojoNetLog);
|
| -};
|
| -
|
| -NetworkContext::NetworkContext(
|
| - scoped_ptr<net::URLRequestContext> url_request_context)
|
| - : net_log_(new MojoNetLog),
|
| - url_request_context_(std::move(url_request_context)),
|
| - in_shutdown_(false) {
|
| - url_request_context_->set_net_log(net_log_.get());
|
| -}
|
| -
|
| -NetworkContext::NetworkContext(
|
| - const base::FilePath& base_path,
|
| - NetworkServiceDelegate* delegate)
|
| - : NetworkContext(MakeURLRequestContext(base_path, delegate)) {
|
| -}
|
| -
|
| -NetworkContext::~NetworkContext() {
|
| - in_shutdown_ = true;
|
| - // TODO(darin): Be careful about destruction order of member variables?
|
| -
|
| - // Call each URLLoaderImpl and ask it to release its net::URLRequest, as the
|
| - // corresponding net::URLRequestContext is going away with this
|
| - // NetworkContext. The loaders can be deregistering themselves in Cleanup(),
|
| - // so iterate over a copy.
|
| - for (auto& url_loader : url_loaders_) {
|
| - url_loader->Cleanup();
|
| - }
|
| -}
|
| -
|
| -void NetworkContext::RegisterURLLoader(URLLoaderImpl* url_loader) {
|
| - DCHECK(url_loaders_.count(url_loader) == 0);
|
| - url_loaders_.insert(url_loader);
|
| -}
|
| -
|
| -void NetworkContext::DeregisterURLLoader(URLLoaderImpl* url_loader) {
|
| - if (!in_shutdown_) {
|
| - size_t removed_count = url_loaders_.erase(url_loader);
|
| - DCHECK(removed_count);
|
| - }
|
| -}
|
| -
|
| -size_t NetworkContext::GetURLLoaderCountForTesting() {
|
| - return url_loaders_.size();
|
| -}
|
| -
|
| -// static
|
| -scoped_ptr<net::URLRequestContext> NetworkContext::MakeURLRequestContext(
|
| - const base::FilePath& base_path,
|
| - NetworkServiceDelegate* delegate) {
|
| - net::URLRequestContextBuilder builder;
|
| - net::URLRequestContextBuilder::HttpNetworkSessionParams params;
|
| - const base::CommandLine* command_line =
|
| - base::CommandLine::ForCurrentProcess();
|
| - if (command_line->HasSwitch(kIgnoreCertificateErrors))
|
| - params.ignore_certificate_errors = true;
|
| - if (command_line->HasSwitch(kTestingFixedHttpPort)) {
|
| - params.testing_fixed_http_port =
|
| - GetPortNumber(*command_line, kTestingFixedHttpPort);
|
| - }
|
| - if (command_line->HasSwitch(kTestingFixedHttpsPort)) {
|
| - params.testing_fixed_https_port =
|
| - GetPortNumber(*command_line, kTestingFixedHttpsPort);
|
| - }
|
| - builder.set_http_network_session_params(params);
|
| -
|
| - if (command_line->HasSwitch(kHostResolverRules)) {
|
| - scoped_ptr<net::HostResolver> host_resolver(
|
| - net::HostResolver::CreateDefaultResolver(nullptr));
|
| - scoped_ptr<net::MappedHostResolver> remapped_host_resolver(
|
| - new net::MappedHostResolver(std::move(host_resolver)));
|
| - remapped_host_resolver->SetRulesFromString(
|
| - command_line->GetSwitchValueASCII(kHostResolverRules));
|
| - builder.set_host_resolver(std::move(remapped_host_resolver));
|
| - }
|
| -
|
| - builder.set_accept_language("en-us,en");
|
| - builder.set_user_agent(mojo::common::GetUserAgent());
|
| - builder.set_proxy_service(net::ProxyService::CreateDirect());
|
| - builder.set_transport_security_persister_path(base_path);
|
| -
|
| - net::URLRequestContextBuilder::HttpCacheParams cache_params;
|
| -#if defined(OS_ANDROID)
|
| - // On Android, we store the cache on disk becase we can run only a single
|
| - // instance of the shell at a time.
|
| - cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK;
|
| - cache_params.path = base_path.Append(FILE_PATH_LITERAL("Cache"));
|
| -#else
|
| - // On desktop, we store the cache in memory so we can run many shells
|
| - // in parallel when running tests, otherwise the network services in each
|
| - // shell will corrupt the disk cache.
|
| - cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::IN_MEMORY;
|
| -#endif
|
| -
|
| - builder.EnableHttpCache(cache_params);
|
| - builder.set_file_enabled(true);
|
| -
|
| - return builder.Build();
|
| -}
|
| -
|
| -} // namespace mojo
|
|
|