summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 07:29:24 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 07:29:24 +0000
commit3295612b187d98b8e64d508fc41595dcc614e8e8 (patch)
tree00ae8d654e8c9102c6e15188a625ce57580f0e0c /content/worker
parent0ea152b98ef30f08442d8f6c74c820f6d0db85bd (diff)
downloadchromium_src-3295612b187d98b8e64d508fc41595dcc614e8e8.zip
chromium_src-3295612b187d98b8e64d508fc41595dcc614e8e8.tar.gz
chromium_src-3295612b187d98b8e64d508fc41595dcc614e8e8.tar.bz2
Update uses of UTF conversions in content/ to use the base:: namespace.
BUG=330556 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/121033002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/worker_webkitplatformsupport_impl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index 1d7b326..23fb80e 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() {