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

Unified Diff: trunk/src/webkit/tools/test_shell/test_shell_request_context.cc

Issue 12605011: Revert 188912 "Removed static factories for data, ftp, file, and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/net/url_request/url_request_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/webkit/tools/test_shell/test_shell_request_context.cc
===================================================================
--- trunk/src/webkit/tools/test_shell/test_shell_request_context.cc (revision 188924)
+++ trunk/src/webkit/tools/test_shell/test_shell_request_context.cc (working copy)
@@ -13,6 +13,7 @@
#include "net/base/cert_verifier.h"
#include "net/base/host_resolver.h"
#include "net/cookies/cookie_monster.h"
+#include "net/ftp/ftp_network_layer.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_network_session.h"
#include "net/http/http_server_properties_impl.h"
@@ -22,7 +23,6 @@
#include "net/ssl/default_server_bound_cert_store.h"
#include "net/ssl/server_bound_cert_service.h"
#include "net/ssl/ssl_config_service_defaults.h"
-#include "net/url_request/file_protocol_handler.h"
#include "net/url_request/http_user_agent_settings.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
@@ -114,6 +114,9 @@
cache->set_mode(cache_mode);
storage_.set_http_transaction_factory(cache);
+ storage_.set_ftp_transaction_factory(
+ new net::FtpNetworkLayer(host_resolver()));
+
blob_storage_controller_.reset(new webkit_blob::BlobStorageController());
file_system_context_ = static_cast<SimpleFileSystem*>(
WebKit::Platform::current()->fileSystem())->file_system_context();
@@ -129,7 +132,6 @@
job_factory->SetProtocolHandler(
"filesystem",
fileapi::CreateFileSystemProtocolHandler(file_system_context_.get()));
- job_factory->SetProtocolHandler("file", new net::FileProtocolHandler);
storage_.set_job_factory(job_factory);
}
« no previous file with comments | « trunk/src/net/url_request/url_request_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698