Remove ConnectivityStateHelper

chrome/browser/chromeos/login/webui_screen_locker.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/webui_screen_locker.h"
 
 #include "ash/shell.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/lock_state_observer.h"
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebUIScreenLocker implementation.
 
 WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)
     : ScreenLockerDelegate(screen_locker),
       lock_ready_(false),
       webui_ready_(false),
+      network_state_helper_(new login::NetworkStateHelper),
       weak_factory_(this) {
   set_should_emit_login_prompt_visible(false);
   ash::Shell::GetInstance()->lock_state_controller()->AddObserver(this);
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
 }
 
 void WebUIScreenLocker::LockScreen() {
   gfx::Rect bounds(ash::Shell::GetScreen()->GetPrimaryDisplay().bounds());
 
   lock_time_ = base::TimeTicks::Now();
@@ skipping 132 matching lines @@
 
 void WebUIScreenLocker::CreateAccount() {
   NOTREACHED();
 }
 
 void WebUIScreenLocker::CompleteLogin(const UserContext& user_context) {
   NOTREACHED();
 }
 
 string16 WebUIScreenLocker::GetConnectedNetworkName() {
-  return GetCurrentNetworkName();
+  return network_state_helper_->GetCurrentNetworkName();
 }
 
 bool WebUIScreenLocker::IsSigninInProgress() const {
   // The way how screen locker is implemented right now there's no
   // GAIA sign in in progress in any case.
   return false;
 }
 
 void WebUIScreenLocker::Login(const UserContext& user_context) {
   chromeos::ScreenLocker::default_screen_locker()->Authenticate(user_context);
@@ skipping 107 matching lines @@
 
 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) {
   if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID &&
       status != base::TERMINATION_STATUS_NORMAL_TERMINATION) {
     LOG(ERROR) << "Renderer crash on lock screen";
     Signout();
   }
 }
 
 }  // namespace chromeos