Start setting up layered component structure for security_interstitials

BUG=488673
TBR=thestig@chromium.org,mattm@chromium.org,estark@chromium.org

Review URL: https://codereview.chromium.org/1265993004

Cr-Commit-Position: refs/heads/master@{#341335}

5 files changed, 27 insertions, 18 deletions

diff --git a/components/security_interstitials/BUILD.gn b/components/security_interstitials/BUILD.gn
deleted file mode 100644
index 30d2eda..0000000
--- a/components/security_interstitials/BUILD.gn
+++ /dev/null
@@ -1,14 +0,0 @@
-source_set("security_interstitials") {
-  sources = [
-    "metrics_helper.cc",
-    "metrics_helper.h",
-  ]
-
-  deps = [
-    "//base",
-    "//components/history/core/browser",
-    "//components/metrics",
-    "//components/rappor",
-    "//net",
-  ]
-}
diff --git a/components/security_interstitials/README b/components/security_interstitials/README
new file mode 100644
index 0000000..82bfd142
--- /dev/null
+++ b/components/security_interstitials/README
@@ -0,0 +1,4 @@
+Componentizing security interstitials is still in progress. Eventually this
+component will include most of the code from chrome/browser/interstitials/ as
+well as the various BlockingPage classes. It will be a layered component to
+allow for iOS support.
\ No newline at end of file
diff --git a/components/security_interstitials/core/BUILD.gn b/components/security_interstitials/core/BUILD.gn
new file mode 100644
index 0000000..d60bad3
--- /dev/null
+++ b/components/security_interstitials/core/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2015 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.
+
+# GYP version: components/security_interstitials.gyp:security_interstitials_core
+static_library("core") {
+  sources = [
+    "metrics_helper.cc",
+    "metrics_helper.h",
+  ]
+
+  deps = [
+    "//base",
+    "//components/history/core/browser",
+    "//components/metrics",
+    "//components/rappor",
+    "//net",
+  ]
+}
diff --git a/components/security_interstitials/metrics_helper.cc b/components/security_interstitials/core/metrics_helper.cc
index b13ecfb..7adeb03 100644
--- a/components/security_interstitials/metrics_helper.cc
+++ b/components/security_interstitials/core/metrics_helper.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 "components/security_interstitials/metrics_helper.h"
+#include "components/security_interstitials/core/metrics_helper.h"
 
 #include "base/metrics/histogram.h"
 #include "components/history/core/browser/history_service.h"
diff --git a/components/security_interstitials/metrics_helper.h b/components/security_interstitials/core/metrics_helper.h
index 2e403bc..e61b83f 100644
--- a/components/security_interstitials/metrics_helper.h
+++ b/components/security_interstitials/core/metrics_helper.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 COMPONENTS_SECURITY_INTERSTITIALS_METRICS_HELPER_H_
-#define COMPONENTS_SECURITY_INTERSTITIALS_METRICS_HELPER_H_
+#ifndef COMPONENTS_SECURITY_INTERSTITIALS_CORE_METRICS_HELPER_H_
+#define COMPONENTS_SECURITY_INTERSTITIALS_CORE_METRICS_HELPER_H_
 
 #include <string>
 
@@ -108,4 +108,4 @@ class MetricsHelper {
 
 }  // namespace security_interstitials
 
-#endif  // COMPONENTS_SECURITY_INTERSTITIALS_METRICS_HELPER_H_
+#endif  // COMPONENTS_SECURITY_INTERSTITIALS_CORE_METRICS_HELPER_H_