Replace string16 with base::string16.

chrome/browser/chromeos/login/screens/network_screen.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 "chrome/browser/chromeos/login/screens/network_screen.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 144 matching lines @@
 }
 
 void NetworkScreen::UpdateStatus() {
   if (!actor_)
     return;
 
   bool is_connected = network_state_helper_->IsConnected();
   if (is_connected)
     actor_->ClearErrors();
 
-  string16 network_name = network_state_helper_->GetCurrentNetworkName();
+  base::string16 network_name = network_state_helper_->GetCurrentNetworkName();
   if (is_connected) {
     StopWaitingForConnection(network_name);
   } else if (network_state_helper_->IsConnecting()) {
     WaitForConnection(network_name);
   } else {
     StopWaitingForConnection(network_id_);
   }
 }
 
-void NetworkScreen::StopWaitingForConnection(const string16& network_id) {
+void NetworkScreen::StopWaitingForConnection(const base::string16& network_id) {
   bool is_connected = network_state_helper_->IsConnected();
   if (is_connected && continue_pressed_) {
     NotifyOnConnection();
     return;
   }
 
   continue_pressed_ = false;
   connection_timer_.Stop();
 
   network_id_ = network_id;
   if (actor_) {
     actor_->ShowConnectingStatus(false, network_id_);
     actor_->EnableContinue(is_connected);
   }
 }
 
-void NetworkScreen::WaitForConnection(const string16& network_id) {
+void NetworkScreen::WaitForConnection(const base::string16& network_id) {
   if (network_id_ != network_id || !connection_timer_.IsRunning()) {
     connection_timer_.Stop();
     connection_timer_.Start(FROM_HERE,
                             base::TimeDelta::FromSeconds(kConnectionTimeoutSec),
                             this,
                             &NetworkScreen::OnConnectionTimeout);
   }
 
   network_id_ = network_id;
   if (actor_) {
     actor_->ShowConnectingStatus(continue_pressed_, network_id_);
     actor_->EnableContinue(false);
   }
 }
 
 }  // namespace chromeos