NetworkPortalDetectorInterface class.

chromeos/network/portal_detector/network_portal_detector.cc

Index: chromeos/network/portal_detector/network_portal_detector.cc
diff --git a/chromeos/network/portal_detector/network_portal_detector.cc b/chromeos/network/portal_detector/network_portal_detector.cc
index a9af6acfa62784e6ea4632aa108eafd37621fe63..01cfe10733a8d45c0c201355d57a046614d49f16 100644
--- a/chromeos/network/portal_detector/network_portal_detector.cc
+++ b/chromeos/network/portal_detector/network_portal_detector.cc
@@ -8,25 +8,14 @@
 
 namespace chromeos {
 
-namespace {
-
-const char kCaptivePortalStatusUnknown[] = "Unknown";
-const char kCaptivePortalStatusOffline[] = "Offline";
-const char kCaptivePortalStatusOnline[]  = "Online";
-const char kCaptivePortalStatusPortal[]  = "Portal";
-const char kCaptivePortalStatusProxyAuthRequired[] = "ProxyAuthRequired";
-const char kCaptivePortalStatusUnrecognized[] = "Unrecognized";
-
-}  // namespace
-
 // static
 bool NetworkPortalDetector::set_for_testing_ = false;
-NetworkPortalDetector* NetworkPortalDetector::network_portal_detector_ =
-    nullptr;
+NetworkPortalDetectorInterface*
+    NetworkPortalDetector::network_portal_detector_ = nullptr;
 
 // static
 void NetworkPortalDetector::InitializeForTesting(
-    NetworkPortalDetector* network_portal_detector) {
+    NetworkPortalDetectorInterface* network_portal_detector) {
   if (network_portal_detector) {
     CHECK(!set_for_testing_)
         << "NetworkPortalDetector::InitializeForTesting is called twice";
@@ -53,30 +42,10 @@ void NetworkPortalDetector::Shutdown() {
 }
 
 // static
-NetworkPortalDetector* NetworkPortalDetector::Get() {
+NetworkPortalDetectorInterface* NetworkPortalDetector::Get() {
   CHECK(network_portal_detector_)
       << "NetworkPortalDetector::Get() called before Initialize()";
   return network_portal_detector_;
 }
 
-// static
-std::string NetworkPortalDetector::CaptivePortalStatusString(
-    CaptivePortalStatus status) {
-  switch (status) {
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
-      return kCaptivePortalStatusUnknown;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
-      return kCaptivePortalStatusOffline;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE:
-      return kCaptivePortalStatusOnline;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL:
-      return kCaptivePortalStatusPortal;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
-      return kCaptivePortalStatusProxyAuthRequired;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT:
-      NOTREACHED();
-  }
-  return kCaptivePortalStatusUnrecognized;
-}
-
 }  // namespace chromeos