Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/chromeos/net/network_portal_detector_impl.cc

 // Copyright (c) 2013 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_detector_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 373 matching lines @@
           << "id=" << default_network_id_;
 
   captive_portal_detector_->Cancel();
   CaptivePortalDetector::Results results;
   results.result = captive_portal::RESULT_NO_RESPONSE;
   OnAttemptCompleted(results);
 }
 
 void NetworkPortalDetectorImpl::OnAttemptCompleted(
     const CaptivePortalDetector::Results& results) {
-  captive_portal::Result result = results.result;
+  captive_portal::CaptivePortalResult result = results.result;
   int response_code = results.response_code;
 
   DCHECK(CalledOnValidThread());
   DCHECK(is_checking_for_portal());
 
   VLOG(1) << "Detection attempt completed: "
           << "name=" << default_network_name_ << ", "
           << "id=" << default_network_id_ << ", "
           << "result="
-          << CaptivePortalDetector::CaptivePortalResultToString(results.result)
+          << captive_portal::CaptivePortalResultToString(results.result)
           << ", "
           << "response_code=" << results.response_code;
 
   state_ = STATE_IDLE;
   attempt_timeout_.Cancel();
   ++attempt_count_;
 
   const NetworkState* network = DefaultNetwork();
 
   // If using a fake profile client, also fake being behind a captive portal
@@ skipping 162 matching lines @@
     PortalDetectorStrategy::StrategyId id) {
   if (id == strategy_->Id())
     return;
   strategy_.reset(PortalDetectorStrategy::CreateById(id).release());
   strategy_->set_delegate(this);
   StopDetection();
   StartDetectionIfIdle();
 }
 
 }  // namespace chromeos