Remove more URLRequest::RegisterProtocolFactory calls.

webkit/tools/test_shell/simple_resource_loader_bridge.cc

 // Copyright (c) 2011 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.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using net::URLRequest, meaning it is a "simple"
 // version that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because net::URLRequest only provides an asynchronous resource loading API,
@@ skipping 78 matching lines @@
       bool in_no_proxy)
       : cache_path(in_cache_path),
         cache_mode(in_cache_mode),
         no_proxy(in_no_proxy) {}
 
   FilePath cache_path;
   net::HttpCache::Mode cache_mode;
   bool no_proxy;
 };
 
-net::URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
-                                             const std::string& scheme) {
-  webkit_blob::BlobStorageController* blob_storage_controller =
-      static_cast<TestShellRequestContext*>(request->context())->
-          blob_storage_controller();
-  return new webkit_blob::BlobURLRequestJob(
-      request,
-      blob_storage_controller->GetBlobDataFromUrl(request->url()),
-      SimpleResourceLoaderBridge::GetIoThread());
-}
-
-
-net::URLRequestJob* FileSystemURLRequestJobFactory(net::URLRequest* request,
-                                                   const std::string& scheme) {
-  fileapi::FileSystemContext* fs_context =
-      static_cast<TestShellRequestContext*>(request->context())
-          ->file_system_context();
-  if (!fs_context) {
-    LOG(WARNING) << "No FileSystemContext found, ignoring filesystem: URL";
-    return NULL;
-  }
-
-  // If the path ends with a /, we know it's a directory. If the path refers
-  // to a directory and gets dispatched to FileSystemURLRequestJob, that class
-  // redirects back here, by adding a / to the URL.
-  const std::string path = request->url().path();
-  if (!path.empty() && path[path.size() - 1] == '/') {
-    return new fileapi::FileSystemDirURLRequestJob(
-        request,
-        fs_context,
-        SimpleResourceLoaderBridge::GetIoThread());
-  }
-  return new fileapi::FileSystemURLRequestJob(
-      request,
-      fs_context,
-      SimpleResourceLoaderBridge::GetIoThread());
-}
-
 TestShellRequestContextParams* g_request_context_params = NULL;
 TestShellRequestContext* g_request_context = NULL;
 base::Thread* g_cache_thread = NULL;
 bool g_accept_all_cookies = false;
 
 //-----------------------------------------------------------------------------
 
 class IOThread : public base::Thread {
  public:
   IOThread() : base::Thread("IOThread") {
@@ skipping 17 matching lines @@
       g_request_context = new TestShellRequestContext();
     }
 
     g_request_context->AddRef();
 
     SimpleAppCacheSystem::InitializeOnIOThread(g_request_context);
     SimpleSocketStreamBridge::InitializeOnIOThread(g_request_context);
     SimpleFileWriter::InitializeOnIOThread(g_request_context);
     TestShellWebBlobRegistryImpl::InitializeOnIOThread(
         g_request_context->blob_storage_controller());
-
-    net::URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory);
-    net::URLRequest::RegisterProtocolFactory("filesystem",
-                                             &FileSystemURLRequestJobFactory);
   }
 
   virtual void CleanUp() {
     // In reverse order of initialization.
     TestShellWebBlobRegistryImpl::Cleanup();
     SimpleFileWriter::CleanupOnIOThread();
     SimpleSocketStreamBridge::Cleanup();
     SimpleAppCacheSystem::CleanupOnIOThread();
 
     if (g_request_context) {
@@ skipping 767 matching lines @@
 
 // static
 scoped_refptr<base::MessageLoopProxy>
     SimpleResourceLoaderBridge::GetIoThread() {
   if (!EnsureIOThread()) {
     LOG(DFATAL) << "Failed to create IO thread.";
     return NULL;
   }
   return g_io_thread->message_loop_proxy();
 }