Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

chrome/browser/signin/signin_names_io_thread_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/signin/signin_manager.h"
@@ skipping 34 matching lines @@
 
 void SigninNamesOnIOThreadTest::SetUp() {
   ASSERT_TRUE(testing_profile_manager_.SetUp());
 }
 
 void SigninNamesOnIOThreadTest::TearDown() {
   signin_names_.ReleaseResourcesOnUIThread();
 }
 
 void SigninNamesOnIOThreadTest::SimulateSignin(const base::string16& email) {
-  GoogleServiceSigninSuccessDetails details(UTF16ToUTF8(email), "password");
+  GoogleServiceSigninSuccessDetails details(
+      base::UTF16ToUTF8(email), "password");
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
       content::Source<Profile>(NULL),
       content::Details<const GoogleServiceSigninSuccessDetails>(&details));
 }
 
 void SigninNamesOnIOThreadTest::SimulateSignout(const base::string16& email) {
-  GoogleServiceSignoutDetails details(UTF16ToUTF8(email));
+  GoogleServiceSignoutDetails details(base::UTF16ToUTF8(email));
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
       content::Source<Profile>(NULL),
       content::Details<const GoogleServiceSignoutDetails>(&details));
 }
 
 void SigninNamesOnIOThreadTest::AddNewProfile(const base::string16& name,
                                               const base::string16& email) {
   ProfileInfoCache* cache = testing_profile_manager_.profile_info_cache();
   const base::FilePath& user_data_dir = cache->GetUserDataDir();
 #if defined(OS_POSIX)
-  const base::FilePath profile_dir = user_data_dir.Append(UTF16ToUTF8(name));
+  const base::FilePath profile_dir =
+      user_data_dir.Append(base::UTF16ToUTF8(name));
 #else
   const base::FilePath profile_dir = user_data_dir.Append(name);
 #endif
   cache->AddProfileToCache(profile_dir, name, email, 0, std::string());
 }
 
 }  // namespace
 
 TEST_F(SigninNamesOnIOThreadTest, Basic) {
   ASSERT_EQ(0u, signin_names_.GetEmails().size());
 }
 
 TEST_F(SigninNamesOnIOThreadTest, Signin) {
-  const base::string16 email = UTF8ToUTF16("foo@gmail.com");
+  const base::string16 email = base::UTF8ToUTF16("foo@gmail.com");
   SimulateSignin(email);
 
   const SigninNamesOnIOThread::EmailSet& emails = signin_names_.GetEmails();
   ASSERT_EQ(1u, emails.size());
   ASSERT_EQ(1u, emails.count(email));
 }
 
 TEST_F(SigninNamesOnIOThreadTest, Signout) {
-  const base::string16 email = UTF8ToUTF16("foo@gmail.com");
+  const base::string16 email = base::UTF8ToUTF16("foo@gmail.com");
   SimulateSignin(email);
   SimulateSignout(email);
 
   const SigninNamesOnIOThread::EmailSet& emails = signin_names_.GetEmails();
   ASSERT_EQ(0u, emails.size());
 }
 
 TEST_F(SigninNamesOnIOThreadTest, HandleUnknownSignout) {
-  const base::string16 email = UTF8ToUTF16("foo@gmail.com");
+  const base::string16 email = base::UTF8ToUTF16("foo@gmail.com");
   SimulateSignin(email);
-  SimulateSignout(UTF8ToUTF16("bar@gmail.com"));
+  SimulateSignout(base::UTF8ToUTF16("bar@gmail.com"));
 
   const SigninNamesOnIOThread::EmailSet& emails = signin_names_.GetEmails();
   ASSERT_EQ(1u, emails.size());
   ASSERT_EQ(1u, emails.count(email));
 }
 
 TEST_F(SigninNamesOnIOThreadTest, StartWithConnectedProfiles) {
   // Setup a couple of connected profiles, and one unconnected.
-  const base::string16 email1 = UTF8ToUTF16("foo@gmail.com");
-  const base::string16 email2 = UTF8ToUTF16("bar@gmail.com");
-  AddNewProfile(UTF8ToUTF16("foo"), email1);
-  AddNewProfile(UTF8ToUTF16("bar"), email2);
-  AddNewProfile(UTF8ToUTF16("toto"), base::string16());
+  const base::string16 email1 = base::UTF8ToUTF16("foo@gmail.com");
+  const base::string16 email2 = base::UTF8ToUTF16("bar@gmail.com");
+  AddNewProfile(base::UTF8ToUTF16("foo"), email1);
+  AddNewProfile(base::UTF8ToUTF16("bar"), email2);
+  AddNewProfile(base::UTF8ToUTF16("toto"), base::string16());
 
   SigninNamesOnIOThread signin_names;
 
   const SigninNamesOnIOThread::EmailSet& emails = signin_names.GetEmails();
   ASSERT_EQ(2u, emails.size());
   ASSERT_EQ(1u, emails.count(email1));
   ASSERT_EQ(1u, emails.count(email2));
 
   signin_names.ReleaseResourcesOnUIThread();
 }