Revert 242455 "Revert 242449 "Update some uses of UTF conversion..."

> Revert 242449 "Update some uses of UTF conversions in chrome/bro..."
> 
> > Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
> > 
> > BUG=330556
> > TEST=no change
> > TBR=ben@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/120943002
> 
> TBR=avi@chromium.org
> 
> Review URL: https://codereview.chromium.org/103853007

TBR=avi@chromium.org

Review URL: https://codereview.chromium.org/120993002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242463 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc b/chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc
index 7702d1f..19b5a5a 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc
@@ -68,9 +68,9 @@ class CandidateWindowViewTest : public views::ViewsTestBase {
                     const std::string& candidate,
                     const std::string& annotation,
                     const CandidateView* row) {
-    EXPECT_EQ(shortcut, UTF16ToUTF8(row->shortcut_label_->text()));
-    EXPECT_EQ(candidate, UTF16ToUTF8(row->candidate_label_->text()));
-    EXPECT_EQ(annotation, UTF16ToUTF8(row->annotation_label_->text()));
+    EXPECT_EQ(shortcut, base::UTF16ToUTF8(row->shortcut_label_->text()));
+    EXPECT_EQ(candidate, base::UTF16ToUTF8(row->candidate_label_->text()));
+    EXPECT_EQ(annotation, base::UTF16ToUTF8(row->annotation_label_->text()));
   }
 };