Move CaptivePortalDetector to src/components/captive_portal

components/captive_portal/captive_portal_testing_utils.h

 // Copyright (c) 2012 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.
 
-#ifndef CHROME_BROWSER_CAPTIVE_PORTAL_TESTING_UTILS_H_
-#define CHROME_BROWSER_CAPTIVE_PORTAL_TESTING_UTILS_H_
+#ifndef COMPONENTS_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TESTING_UTILS_H_
+#define COMPONENTS_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TESTING_UTILS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/captive_portal/captive_portal_detector.h"
+#include "components/captive_portal/captive_portal_detector.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 
 namespace base {
 class Time;
 }
 
-namespace net {
+namespace captive_portal {
+
 class URLFetcher;

[mmenke, 2014/04/21 14:32:43]

There isn't a captive_portal::URLFetcher class...  In fact, we don't seem to
need this forward declaration at all.

[stevenjb, 2014/04/21 16:42:27]

Done.

-}
-
-namespace captive_portal {
 
 class CaptivePortalDetectorTestBase {
  public:
   CaptivePortalDetectorTestBase();
   virtual ~CaptivePortalDetectorTestBase();
 
   // Sets test time for captive portal detector.
   void SetTime(const base::Time& time);
 
   // Advances test time for captive portal detector.
@@ skipping 15 matching lines @@
  protected:
   CaptivePortalDetector* detector_;
 
   net::TestURLFetcherFactory factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalDetectorTestBase);
 };
 
 }  // namespace captive_portal
 
-#endif  // CHROME_BROWSER_CAPTIVE_PORTAL_TESTING_UTILS_H_
+#endif  // COMPONENTS_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TESTING_UTILS_H_