commit 3295612b187d98b8e64d508fc41595dcc614e8e8
author avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Dec 25 07:29:24 2013
committer avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Dec 25 07:29:24 2013
tree 00ae8d654e8c9102c6e15188a625ce57580f0e0c
parent 0ea152b98ef30f08442d8f6c74c820f6d0db85bd

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

content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 8e34582f..9cd08f8 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2709,7 +2709,7 @@
   base::string16 final_title;
   bool explicit_set;
   if (entry && entry->GetURL().SchemeIsFile() && title.empty()) {
-    final_title = UTF8ToUTF16(entry->GetURL().ExtractFileName());
+    final_title = base::UTF8ToUTF16(entry->GetURL().ExtractFileName());
     explicit_set = false;  // Don't count synthetic titles toward the set limit.
   } else {
     TrimWhitespace(title, TRIM_ALL, &final_title);