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

Unified Diff: content/worker/worker_webkitplatformsupport_impl.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « content/test/webrtc_audio_device_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/worker/worker_webkitplatformsupport_impl.cc
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index 1d7b326587250a793798a6580d94db6e1bf34701..23fb80ea08dfbac831f95b7dbd6c431b3c4b114f 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -264,7 +264,7 @@ WebString WorkerWebKitPlatformSupportImpl::mimeTypeForExtension(
std::string mime_type;
thread_safe_sender_->Send(new MimeRegistryMsg_GetMimeTypeFromExtension(
base::FilePath::FromUTF16Unsafe(file_extension).value(), &mime_type));
- return ASCIIToUTF16(mime_type);
+ return base::ASCIIToUTF16(mime_type);
}
WebString WorkerWebKitPlatformSupportImpl::wellKnownMimeTypeForExtension(
@@ -272,7 +272,7 @@ WebString WorkerWebKitPlatformSupportImpl::wellKnownMimeTypeForExtension(
std::string mime_type;
net::GetWellKnownMimeTypeFromExtension(
base::FilePath::FromUTF16Unsafe(file_extension).value(), &mime_type);
- return ASCIIToUTF16(mime_type);
+ return base::ASCIIToUTF16(mime_type);
}
WebString WorkerWebKitPlatformSupportImpl::mimeTypeFromFile(
@@ -282,7 +282,7 @@ WebString WorkerWebKitPlatformSupportImpl::mimeTypeFromFile(
new MimeRegistryMsg_GetMimeTypeFromFile(
base::FilePath::FromUTF16Unsafe(file_path),
&mime_type));
- return ASCIIToUTF16(mime_type);
+ return base::ASCIIToUTF16(mime_type);
}
WebBlobRegistry* WorkerWebKitPlatformSupportImpl::blobRegistry() {
« no previous file with comments | « content/test/webrtc_audio_device_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698