Index: net/url_request/url_request_job_manager.cc |
diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc |
index b4b6e2e83653314583ea05dd7c7b320ffa44f94e..fd893564913a3483868e93bdda5f293a95c888ee 100644 |
--- a/net/url_request/url_request_job_manager.cc |
+++ b/net/url_request/url_request_job_manager.cc |
@@ -14,31 +14,10 @@ |
#include "net/base/network_delegate.h" |
#include "net/url_request/url_request_context.h" |
#include "net/url_request/url_request_error_job.h" |
-#include "net/url_request/url_request_http_job.h" |
#include "net/url_request/url_request_job_factory.h" |
namespace net { |
-// The built-in set of protocol factories |
-namespace { |
- |
-struct SchemeToFactory { |
- const char* scheme; |
- URLRequest::ProtocolFactory* factory; |
-}; |
- |
-} // namespace |
- |
-static const SchemeToFactory kBuiltinFactories[] = { |
- { "http", URLRequestHttpJob::Factory }, |
- { "https", URLRequestHttpJob::Factory }, |
- |
-#if !defined(OS_IOS) |
- { "ws", URLRequestHttpJob::Factory }, |
- { "wss", URLRequestHttpJob::Factory }, |
-#endif // !defined(OS_IOS) |
-}; |
- |
// static |
URLRequestJobManager* URLRequestJobManager::GetInstance() { |
return base::Singleton<URLRequestJobManager>::get(); |
@@ -73,16 +52,6 @@ URLRequestJob* URLRequestJobManager::CreateJob( |
if (job) |
return job; |
- // See if the request should be handled by a built-in protocol factory. |
- for (size_t i = 0; i < arraysize(kBuiltinFactories); ++i) { |
- if (scheme == kBuiltinFactories[i].scheme) { |
- URLRequestJob* new_job = |
- (kBuiltinFactories[i].factory)(request, network_delegate, scheme); |
- DCHECK(new_job); // The built-in factories are not expected to fail! |
- return new_job; |
- } |
- } |
- |
// If we reached here, then it means that a registered protocol factory |
// wasn't interested in handling the URL. That is fairly unexpected, and we |
// don't have a specific error to report here :-( |
@@ -140,18 +109,6 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptResponse( |
return NULL; |
} |
-// TODO(mgersh): remove this and fix remaining callers once HttpProtocolHandler |
-// exists |
-// static |
-bool URLRequestJobManager::SupportsScheme(const std::string& scheme) { |
- for (size_t i = 0; i < arraysize(kBuiltinFactories); ++i) { |
- if (base::LowerCaseEqualsASCII(scheme, kBuiltinFactories[i].scheme)) |
- return true; |
- } |
- |
- return false; |
-} |
- |
URLRequestJobManager::URLRequestJobManager() { |
} |