Remove ConnectivityStateHelper

chrome/browser/chromeos/login/helper.h

 // 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.
 //
 // This file contains helper functions used by Chromium OS login.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_HELPER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_HELPER_H_
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/views/view.h"
 
 class GURL;
 
 namespace gfx {
 class Rect;
 class Size;
 }  // namespace gfx
 
 namespace chromeos {
 
 // Returns bounds of the screen to use for login wizard.
 // The rect is centered within the default monitor and sized accordingly if
 // |size| is not empty. Otherwise the whole monitor is occupied.
 gfx::Rect CalculateScreenBounds(const gfx::Size& size);
 
-// Returns name of the currently connected network.
-// If there are no connected networks, returns name of the network
-// that is in the "connecting" state. Otherwise empty string is returned.
-// If there are multiple connected networks, network priority:
-// Ethernet > WiFi > Cellular. Same for connecting network.
-string16 GetCurrentNetworkName();
-
 // Returns the size of user image required for proper display under current DPI.
 int GetCurrentUserImageSize();
 
 // Define the constants in |login| namespace to avoid potential
 // conflict with other chromeos components.
 namespace login {
 
 // Maximum size of user image, in which it should be saved to be properly
 // displayed under all possible DPI values.
 const int kMaxUserImageSize = 512;
 
+// A helper class for easily mocking out Network*Handler calls for tests.
+class NetworkStateHelper {
+ public:
+  NetworkStateHelper();
+  virtual ~NetworkStateHelper();
+
+  // Returns name of the currently connected network.
+  // If there are no connected networks, returns name of the network
+  // that is in the "connecting" state. Otherwise empty string is returned.
+  // If there are multiple connected networks, network priority:
+  // Ethernet > WiFi > Cellular. Same for connecting network.
+  virtual string16 GetCurrentNetworkName() const;
+
+  // Returns true if the default network is in connected state.
+  virtual bool IsConnected() const;
+
+  // Returns true if the default network is in connecting state.
+  virtual bool IsConnecting() const;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(NetworkStateHelper);
+};
+
 }  // namespace login
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_HELPER_H_