Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/chromeos/net/network_portal_notification_controller.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 "chrome/browser/chromeos/net/network_portal_notification_controller.h"
 
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/captive_portal/captive_portal_detector.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_state.h"
+#include "components/captive_portal/captive_portal_detector.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/notifier_settings.h"
 
 using message_center::Notification;
@@ skipping 95 matching lines @@
 
 NetworkPortalNotificationController::~NetworkPortalNotificationController() {}
 
 void NetworkPortalNotificationController::OnPortalDetectionCompleted(
     const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalState& state) {
   if (!IsPortalNotificationEnabled())
     return;
 
   if (!network ||
-      state.status != NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL) {
+      state.status != captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL) {
     last_network_path_.clear();
     CloseNotification();
     return;
   }
 
   // Don't do anything if notification for |network| already was
   // displayed.
   if (network->path() == last_network_path_)
     return;
   last_network_path_ = network->path();
@@ skipping 20 matching lines @@
   if (ash::Shell::HasInstance()) {
     ash::Shell::GetInstance()
         ->system_tray_notifier()
         ->NotifyOnCaptivePortalDetected(network->path());
   }
 
   message_center::MessageCenter::Get()->AddNotification(notification.Pass());
 }
 
 }  // namespace chromeos