Add base:: namespace to straggling string16s left in chrome/browser/ui.

chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

 // Copyright 2013 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 "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 74 matching lines @@
       info_cache.IsUsingGAIAPictureOfProfileAtIndex(index) &&
       info_cache.GetGAIAPictureOfProfileAtIndex(index);
 
   gfx::Image icon = profiles::GetSizedAvatarIconWithBorder(
       info_cache.GetAvatarIconOfProfileAtIndex(index),
       is_gaia_picture, kAvatarIconSize, kAvatarIconSize);
   return webui::GetBitmapDataUrl(icon.AsBitmap());
 }
 
 size_t GetIndexOfProfileWithEmailAndName(const ProfileInfoCache& info_cache,
-                                         const string16& email,
-                                         const string16& name) {
+                                         const base::string16& email,
+                                         const base::string16& name) {
   for (size_t i = 0; i < info_cache.GetNumberOfProfiles(); ++i) {
     if (info_cache.GetUserNameOfProfileAtIndex(i) == email &&
         info_cache.GetNameOfProfileAtIndex(i) == name) {
       return i;
     }
   }
   return std::string::npos;
 }
 
 } // namespace
@@ skipping 76 matching lines @@
       web_ui()->GetWebContents()->GetView()->GetNativeView());
 }
 
 void UserManagerScreenHandler::HandleAddUser(const base::ListValue* args) {
   profiles::CreateAndSwitchToNewProfile(desktop_type_,
                                         base::Bind(&chrome::HideUserManager));
 }
 
 void UserManagerScreenHandler::HandleAuthenticatedLaunchUser(
     const base::ListValue* args) {
-  string16 email_address;
+  base::string16 email_address;
   if (!args->GetString(0, &email_address))
     return;
 
-  string16 display_name;
+  base::string16 display_name;
   if (!args->GetString(1, &display_name))
     return;
 
   std::string password;
   if (!args->GetString(2, &password))
     return;
 
   ProfileInfoCache& info_cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t profile_index = GetIndexOfProfileWithEmailAndName(
@@ skipping 41 matching lines @@
       profile_path,
       base::Bind(&OpenNewWindowForProfile, desktop_type_));
 }
 
 void UserManagerScreenHandler::HandleLaunchGuest(const base::ListValue* args) {
   profiles::SwitchToGuestProfile(desktop_type_,
                                  base::Bind(&chrome::HideUserManager));
 }
 
 void UserManagerScreenHandler::HandleLaunchUser(const base::ListValue* args) {
-  base::string16 emailAddress;
-  base::string16 displayName;
+  base::string16 email_address;
+  base::string16 display_name;
 
-  if (!args->GetString(0, &emailAddress) ||
-      !args->GetString(1, &displayName)) {
+  if (!args->GetString(0, &email_address) ||
+      !args->GetString(1, &display_name)) {
     NOTREACHED();
     return;
   }
 
   ProfileInfoCache& info_cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t profile_index = GetIndexOfProfileWithEmailAndName(
-      info_cache, emailAddress, displayName);
+      info_cache, email_address, display_name);
 
   if (profile_index >= info_cache.GetNumberOfProfiles()) {
     NOTREACHED();
     return;
   }
 
   // It's possible that a user breaks into the user-manager page using the
   // JavaScript Inspector and causes a "locked" profile to call this
   // unauthenticated version of "launch" instead of the proper one.  Thus,
   // we have to validate in (secure) C++ code that it really is a profile
@@ skipping 129 matching lines @@
     // The row of user pods should display the active user first.
     if (is_active_user)
       users_list.Insert(0, profile_value);
     else
       users_list.Append(profile_value);
   }
 
   web_ui()->CallJavascriptFunction("login.AccountPickerScreen.loadUsers",
     users_list, base::FundamentalValue(false), base::FundamentalValue(true));
 }