[Captive Portal] Componentize CaptivePortalURLLoaderThrottle

This class isn't actually needed as part of the ongoing componentization
of SSLErrorHandler, but it makes more sense for it to live with all of
its peer code in //components than to remain stranded in //chrome
while all the rest of the guts of //chrome/browser/captive_portal has
been componentized.

TBR=jochen@chromium.org

Change-Id: Ia2b2d7baa26910325a11916f46e388e64a93b550
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019444
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735864}

chrome/browser/BUILD.gn

@@ -4481,8 +4481,6 @@ jumbo_static_library("browser") {
     sources += [
       "captive_portal/captive_portal_service_factory.cc",
       "captive_portal/captive_portal_service_factory.h",
-      "captive_portal/captive_portal_url_loader_throttle.cc",
-      "captive_portal/captive_portal_url_loader_throttle.h",
       "ssl/captive_portal_metrics_recorder.cc",
       "ssl/captive_portal_metrics_recorder.h",
     ]

chrome/browser/chrome_content_browser_client.cc

@@ -493,8 +493,8 @@
 #endif
 
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
-#include "chrome/browser/captive_portal/captive_portal_url_loader_throttle.h"
 #include "components/captive_portal/content/captive_portal_tab_helper.h"
+#include "components/captive_portal/content/captive_portal_url_loader_throttle.h"
 #endif
 
 #if BUILDFLAG(ENABLE_NACL)

components/captive_portal/content/BUILD.gn

@@ -16,6 +16,8 @@ source_set("content") {
       "captive_portal_tab_helper.h",
       "captive_portal_tab_reloader.cc",
       "captive_portal_tab_reloader.h",
+      "captive_portal_url_loader_throttle.cc",
+      "captive_portal_url_loader_throttle.h",
     ]
   }
 
@@ -32,6 +34,7 @@ source_set("content") {
   deps = [
     "//components/embedder_support",
     "//content/public/browser",
+    "//third_party/blink/public/common",
   ]
 }
 

components/captive_portal/content/DEPS

@@ -7,5 +7,6 @@ include_rules = [
   "+content/public/test",
   "+services/network/public/cpp",
   "+net",
+  "+third_party/blink/public/common",
   "+url",
 ]

chrome/browser/captive_portal/captive_portal_url_loader_throttle.cc → components/captive_portal/content/captive_portal_url_loader_throttle.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/captive_portal/captive_portal_url_loader_throttle.h"
+#include "components/captive_portal/content/captive_portal_url_loader_throttle.h"
 
 #include "components/captive_portal/content/captive_portal_tab_helper.h"
 

chrome/browser/captive_portal/captive_portal_url_loader_throttle.h → components/captive_portal/content/captive_portal_url_loader_throttle.h

@@ -2,8 +2,8 @@
 // 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_CAPTIVE_PORTAL_URL_LOADER_THROTTLE_H_
-#define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_URL_LOADER_THROTTLE_H_
+#ifndef COMPONENTS_CAPTIVE_PORTAL_CONTENT_CAPTIVE_PORTAL_URL_LOADER_THROTTLE_H_
+#define COMPONENTS_CAPTIVE_PORTAL_CONTENT_CAPTIVE_PORTAL_URL_LOADER_THROTTLE_H_
 
 #include "content/public/browser/web_contents.h"
 #include "third_party/blink/public/common/loader/url_loader_throttle.h"
@@ -25,4 +25,4 @@ class CaptivePortalURLLoaderThrottle : public blink::URLLoaderThrottle {
   bool is_captive_portal_window_;
 };
 
-#endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_URL_LOADER_THROTTLE_H_
+#endif  // COMPONENTS_CAPTIVE_PORTAL_CONTENT_CAPTIVE_PORTAL_URL_LOADER_THROTTLE_H_