| Index: chrome/browser/chromeos/net/network_portal_detector.cc
|
| diff --git a/chrome/browser/chromeos/net/network_portal_detector.cc b/chrome/browser/chromeos/net/network_portal_detector.cc
|
| index 3a4c4658cac5e10b69cbdd233d78373be1a06695..583c06bcdf78cac8b40df8a24b897621d2940366 100644
|
| --- a/chrome/browser/chromeos/net/network_portal_detector.cc
|
| +++ b/chrome/browser/chromeos/net/network_portal_detector.cc
|
| @@ -16,13 +16,6 @@ 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";
|
| -
|
| NetworkPortalDetector* g_network_portal_detector = NULL;
|
| bool g_network_portal_detector_set_for_testing = false;
|
|
|
| @@ -99,26 +92,6 @@ NetworkPortalDetector* NetworkPortalDetector::Get() {
|
| }
|
|
|
| // static
|
| -std::string NetworkPortalDetector::CaptivePortalStatusString(
|
| - CaptivePortalStatus status) {
|
| - switch (status) {
|
| - case NetworkPortalDetectorImpl::CAPTIVE_PORTAL_STATUS_UNKNOWN:
|
| - return kCaptivePortalStatusUnknown;
|
| - case NetworkPortalDetectorImpl::CAPTIVE_PORTAL_STATUS_OFFLINE:
|
| - return kCaptivePortalStatusOffline;
|
| - case NetworkPortalDetectorImpl::CAPTIVE_PORTAL_STATUS_ONLINE:
|
| - return kCaptivePortalStatusOnline;
|
| - case NetworkPortalDetectorImpl::CAPTIVE_PORTAL_STATUS_PORTAL:
|
| - return kCaptivePortalStatusPortal;
|
| - case NetworkPortalDetectorImpl::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
|
| - return kCaptivePortalStatusProxyAuthRequired;
|
| - case NetworkPortalDetectorImpl::CAPTIVE_PORTAL_STATUS_COUNT:
|
| - NOTREACHED();
|
| - }
|
| - return kCaptivePortalStatusUnrecognized;
|
| -}
|
| -
|
| -// static
|
| bool NetworkPortalDetector::IsInitialized() {
|
| return g_network_portal_detector;
|
| }
|
|
|