Index: chrome/browser/profiles/profile_io_data.cc |
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
index 520e762395071f6f2e0a6a193fb2142e7e7be3b3..918f919b47b030184436454996ce342a4faaa57a 100644 |
--- a/chrome/browser/profiles/profile_io_data.cc |
+++ b/chrome/browser/profiles/profile_io_data.cc |
@@ -613,22 +613,22 @@ ProfileIOData* ProfileIOData::FromResourceContext( |
bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { |
DCHECK_EQ(scheme, StringToLowerASCII(scheme)); |
static const char* const kProtocolList[] = { |
- content::kFileScheme, |
+ url::kFileScheme, |
content::kChromeDevToolsScheme, |
chrome::kDomDistillerScheme, |
extensions::kExtensionScheme, |
extensions::kExtensionResourceScheme, |
content::kChromeUIScheme, |
- content::kDataScheme, |
+ url::kDataScheme, |
#if defined(OS_CHROMEOS) |
chrome::kDriveScheme, |
#endif // defined(OS_CHROMEOS) |
content::kAboutScheme, |
#if !defined(DISABLE_FTP_SUPPORT) |
- content::kFtpScheme, |
+ url::kFtpScheme, |
#endif // !defined(DISABLE_FTP_SUPPORT) |
- content::kBlobScheme, |
- content::kFileSystemScheme, |
+ url::kBlobScheme, |
+ url::kFileSystemScheme, |
chrome::kChromeSearchScheme, |
}; |
for (size_t i = 0; i < arraysize(kProtocolList); ++i) { |
@@ -1031,7 +1031,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults( |
// NOTE(willchan): Keep these protocol handlers in sync with |
// ProfileIOData::IsHandledProtocol(). |
bool set_protocol = job_factory->SetProtocolHandler( |
- content::kFileScheme, |
+ url::kFileScheme, |
new net::FileProtocolHandler( |
content::BrowserThread::GetBlockingPool()-> |
GetTaskRunnerWithShutdownBehavior( |
@@ -1051,7 +1051,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults( |
CreateExtensionResourceProtocolHandler()); |
DCHECK(set_protocol); |
set_protocol = job_factory->SetProtocolHandler( |
- content::kDataScheme, new net::DataProtocolHandler()); |
+ url::kDataScheme, new net::DataProtocolHandler()); |
DCHECK(set_protocol); |
#if defined(OS_CHROMEOS) |
if (!IsOffTheRecord() && profile_params_) { |
@@ -1067,7 +1067,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults( |
#if !defined(DISABLE_FTP_SUPPORT) |
DCHECK(ftp_transaction_factory); |
job_factory->SetProtocolHandler( |
- content::kFtpScheme, |
+ url::kFtpScheme, |
new net::FtpProtocolHandler(ftp_transaction_factory)); |
#endif // !defined(DISABLE_FTP_SUPPORT) |