Index: content/renderer/renderer_webkitplatformsupport_impl.cc |
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc |
index 6013a05d052d7a7a0c20ba3c3e25d374cf3223bf..c7fa2715a59a8d381cb6f46b65fda3da8b67d219 100644 |
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc |
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc |
@@ -338,7 +338,7 @@ void RendererWebKitPlatformSupportImpl::cacheMetadata( |
} |
WebString RendererWebKitPlatformSupportImpl::defaultLocale() { |
- return ASCIIToUTF16(RenderThread::Get()->GetLocale()); |
+ return base::ASCIIToUTF16(RenderThread::Get()->GetLocale()); |
} |
void RendererWebKitPlatformSupportImpl::suddenTerminationChanged(bool enabled) { |
@@ -456,7 +456,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeForExtension( |
RenderThread::Get()->Send( |
new MimeRegistryMsg_GetMimeTypeFromExtension( |
base::FilePath::FromUTF16Unsafe(file_extension).value(), &mime_type)); |
- return ASCIIToUTF16(mime_type); |
+ return base::ASCIIToUTF16(mime_type); |
} |
WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile( |
@@ -470,7 +470,7 @@ WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile( |
RenderThread::Get()->Send(new MimeRegistryMsg_GetMimeTypeFromFile( |
base::FilePath::FromUTF16Unsafe(file_path), |
&mime_type)); |
- return ASCIIToUTF16(mime_type); |
+ return base::ASCIIToUTF16(mime_type); |
} |
//------------------------------------------------------------------------------ |
@@ -716,7 +716,7 @@ RendererWebKitPlatformSupportImpl::createAudioDevice( |
int session_id = 0; |
if (input_device_id.isNull() || |
- !base::StringToInt(UTF16ToUTF8(input_device_id), &session_id)) { |
+ !base::StringToInt(base::UTF16ToUTF8(input_device_id), &session_id)) { |
if (input_channels > 0) |
DLOG(WARNING) << "createAudioDevice(): request for audio input ignored"; |