| Index: chrome/browser/io_thread.cc
|
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
|
| index 540a26f61d1932676db6678e1d9d51d31aea4ffd..6893de8ce4dbc79f20e8766781c2043ddf600e04 100644
|
| --- a/chrome/browser/io_thread.cc
|
| +++ b/chrome/browser/io_thread.cc
|
| @@ -41,7 +41,6 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/chrome_version_info.h"
|
| #include "chrome/common/pref_names.h"
|
| -#include "chrome/common/url_constants.h"
|
| #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
|
| #include "components/data_reduction_proxy/browser/http_auth_handler_data_reduction_proxy.h"
|
| #include "components/policy/core/common/policy_service.h"
|
| @@ -80,6 +79,7 @@
|
| #include "net/url_request/url_request_job_factory_impl.h"
|
| #include "net/url_request/url_request_throttler_manager.h"
|
| #include "net/websockets/websocket_job.h"
|
| +#include "url/url_constants.h"
|
|
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| #include "policy/policy_constants.h"
|
| @@ -655,10 +655,10 @@ void IOThread::InitAsync() {
|
| TRACE_EVENT_END0("startup", "IOThread::InitAsync:HttpNetworkSession");
|
| scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
|
| new net::URLRequestJobFactoryImpl());
|
| - job_factory->SetProtocolHandler(content::kDataScheme,
|
| + job_factory->SetProtocolHandler(url::kDataScheme,
|
| new net::DataProtocolHandler());
|
| job_factory->SetProtocolHandler(
|
| - content::kFileScheme,
|
| + url::kFileScheme,
|
| new net::FileProtocolHandler(
|
| content::BrowserThread::GetBlockingPool()->
|
| GetTaskRunnerWithShutdownBehavior(
|
| @@ -667,7 +667,7 @@ void IOThread::InitAsync() {
|
| globals_->proxy_script_fetcher_ftp_transaction_factory.reset(
|
| new net::FtpNetworkLayer(globals_->host_resolver.get()));
|
| job_factory->SetProtocolHandler(
|
| - content::kFtpScheme,
|
| + url::kFtpScheme,
|
| new net::FtpProtocolHandler(
|
| globals_->proxy_script_fetcher_ftp_transaction_factory.get()));
|
| #endif
|
|
|