Remove 'using base::string16;' from base/strings/string16.h and remove temporary

chrome/browser/chromeos/login/oauth2_browsertest.cc

 // Copyright (c) 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 "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/oauth2_login_manager.h"
@@ skipping 569 matching lines @@
       fake_google_page_url_,
       CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
 
   // Wait until we get send merge session request.
   WaitForMergeSessionToStart();
 
   // Make sure the page is blocked by the throttle.
   ASSERT_FALSE(fake_google_.was_page_sent());
 
   // Check that throttle page is displayed instead.
-  string16 title;
+  base::string16 title;
   ui_test_utils::GetCurrentTabTitle(browser, &title);
   LOG(WARNING) << "Loaded page at the start : " << title;
 //  ui_test_utils::GetCurrentTabTitle(browser, &title);
 //  JsExpect(browser->tab_strip_model()->GetActiveWebContents(),
 //           "document.getElementById('msg').innerText='Loading...'");
 //  LOG(WARNING) << "Loaded page at the start: " << title;
 
   // Unblock GAIA request.
   UnblockMergeSession();
 
   // Wait for the session merge to finish.
   WaitForMergeSessionCompletion(OAuth2LoginManager::SESSION_RESTORE_DONE);
 
   // Check that real page is no longer blocked by the throttle and that the
   // real page pops up JS dialog.
   AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog();
   ASSERT_TRUE(dialog->IsJavaScriptModalDialog());
   JavaScriptAppModalDialog* js_dialog =
       static_cast<JavaScriptAppModalDialog*>(dialog);
   js_dialog->native_dialog()->AcceptAppModalDialog();
 
   ASSERT_TRUE(fake_google_.was_page_sent());
 
   ui_test_utils::GetCurrentTabTitle(browser, &title);
   LOG(WARNING) << "Loaded page at the end : " << title;
 }
 
 }  // namespace chromeos