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

Unified Diff: android_webview/browser/net/aw_url_request_context_getter.cc

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing files. Created 6 years, 7 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
Index: android_webview/browser/net/aw_url_request_context_getter.cc
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 46bff358b93734f1d218f00ac3c950ddde728388..218f09a9c156e89ba5ada3241cba824d0274fa01 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -103,22 +103,22 @@ scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
content::ProtocolHandlerMap* protocol_handlers) {
scoped_ptr<AwURLRequestJobFactory> aw_job_factory(new AwURLRequestJobFactory);
bool set_protocol = aw_job_factory->SetProtocolHandler(
- content::kFileScheme,
+ url::kFileScheme,
new net::FileProtocolHandler(
content::BrowserThread::GetBlockingPool()->
GetTaskRunnerWithShutdownBehavior(
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
- content::kDataScheme, new net::DataProtocolHandler());
+ url::kDataScheme, new net::DataProtocolHandler());
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
- content::kBlobScheme,
- (*protocol_handlers)[content::kBlobScheme].release());
+ url::kBlobScheme,
+ (*protocol_handlers)[url::kBlobScheme].release());
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
- content::kFileSystemScheme,
- (*protocol_handlers)[content::kFileSystemScheme].release());
+ url::kFileSystemScheme,
+ (*protocol_handlers)[url::kFileSystemScheme].release());
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
content::kChromeUIScheme,

Powered by Google App Engine
This is Rietveld 408576698