Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc

 // Copyright 2014 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 "base/command_line.h"
 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/message_center.h"
@@ skipping 80 matching lines @@
   NotificationObserver observer_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkPortalNotificationControllerTest);
 };
 
 TEST_F(NetworkPortalNotificationControllerTest, NetworkStateChanged) {
   NetworkState wifi("wifi");
   NetworkPortalDetector::CaptivePortalState wifi_state;
 
   // Notification is not displayed for online state.
-  wifi_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
+  wifi_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;
   wifi_state.response_code = 204;
   OnPortalDetectionCompleted(&wifi, wifi_state);
   ASSERT_FALSE(HasNotification());
 
   // Notification is displayed for portal state
-  wifi_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
+  wifi_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;
   wifi_state.response_code = 200;
   OnPortalDetectionCompleted(&wifi, wifi_state);
   ASSERT_TRUE(HasNotification());
 
   // Notification is closed for online state.
-  wifi_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
+  wifi_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;
   wifi_state.response_code = 204;
   OnPortalDetectionCompleted(&wifi, wifi_state);
   ASSERT_FALSE(HasNotification());
 }
 
 TEST_F(NetworkPortalNotificationControllerTest, NetworkChanged) {
   NetworkState wifi1("wifi1");
   NetworkPortalDetector::CaptivePortalState wifi1_state;
-  wifi1_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
+  wifi1_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;
   wifi1_state.response_code = 200;
   OnPortalDetectionCompleted(&wifi1, wifi1_state);
   ASSERT_TRUE(HasNotification());
 
   MessageCenter::Get()->RemoveNotification(kNotificationId, true /* by_user */);
   ASSERT_FALSE(HasNotification());
 
   // User already closed notification about portal state for this network,
   // so notification shouldn't be displayed second time.
   OnPortalDetectionCompleted(&wifi1, wifi1_state);
   ASSERT_FALSE(HasNotification());
 
   NetworkState wifi2("wifi2");
   NetworkPortalDetector::CaptivePortalState wifi2_state;
-  wifi2_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
+  wifi2_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;
   wifi2_state.response_code = 204;
 
   // Second network is in online state, so there shouldn't be any
   // notifications.
   OnPortalDetectionCompleted(&wifi2, wifi2_state);
   ASSERT_FALSE(HasNotification());
 
   // User switches back to the first network, so notification should
   // be displayed.
   OnPortalDetectionCompleted(&wifi1, wifi1_state);
   ASSERT_TRUE(HasNotification());
 }
 
 TEST_F(NetworkPortalNotificationControllerTest, NotificationUpdated) {
   NetworkPortalDetector::CaptivePortalState portal_state;
-  portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
+  portal_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;
   portal_state.response_code = 200;
 
   // First network is behind a captive portal, so notification should
   // be displayed.
   NetworkState wifi1("wifi1");
   OnPortalDetectionCompleted(&wifi1, portal_state);
   ASSERT_TRUE(HasNotification());
   EXPECT_EQ(1u, observer().add_count());
   EXPECT_EQ(0u, observer().remove_count());
   EXPECT_EQ(0u, observer().update_count());
@@ skipping 26 matching lines @@
   // Network was switched (by shill or by user) to wifi1. Notification
   // should be displayed.
   OnPortalDetectionCompleted(&wifi1, portal_state);
   ASSERT_TRUE(HasNotification());
   EXPECT_EQ(2u, observer().add_count());
   EXPECT_EQ(1u, observer().remove_count());
   EXPECT_EQ(1u, observer().update_count());
 }
 
 }  // namespace chromeos