diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 07:29:24 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 07:29:24 +0000 |
| commit | 3295612b187d98b8e64d508fc41595dcc614e8e8 (patch) | |
| tree | 00ae8d654e8c9102c6e15188a625ce57580f0e0c /content/browser/plugin_service_impl.cc | |
| parent | 0ea152b98ef30f08442d8f6c74c820f6d0db85bd (diff) | |
| download | chromium_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/browser/plugin_service_impl.cc')
| -rw-r--r-- | content/browser/plugin_service_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index cb0a7b4..b65704b 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -292,7 +292,7 @@ PluginProcessHost* PluginServiceImpl::FindOrStartNpapiPluginProcess( // Record when NPAPI Flash process is started for the first time. static bool counted = false; - if (!counted && UTF16ToUTF8(info.name) == kFlashPluginName) { + if (!counted && base::UTF16ToUTF8(info.name) == kFlashPluginName) { counted = true; UMA_HISTOGRAM_ENUMERATION("Plugin.FlashUsage", START_NPAPI_FLASH_AT_LEAST_ONCE, @@ -574,7 +574,7 @@ base::string16 PluginServiceImpl::GetPluginDisplayNameByPath( // Many plugins on the Mac have .plugin in the actual name, which looks // terrible, so look for that and strip it off if present. const std::string kPluginExtension = ".plugin"; - if (EndsWith(plugin_name, ASCIIToUTF16(kPluginExtension), true)) + if (EndsWith(plugin_name, base::ASCIIToUTF16(kPluginExtension), true)) plugin_name.erase(plugin_name.length() - kPluginExtension.length()); #endif // OS_MACOSX } |