Revert "Move subresource_redirect proto to components"

This reverts commit fd90951e.

Reason for revert: crbug.com/1166280

Original change's description:
> Move subresource_redirect proto to components
>
> Moves the robots_rules.proto from chrome/renderer to components/
>
> Bug: 1160424
> Change-Id: I0b2af266e3a6de40872bf094195b7f0c21c42096
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2623647
> Commit-Queue: rajendrant <rajendrant@chromium.org>
> Reviewed-by: Michael Crouse <mcrouse@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#842827}

TBR=rajendrant@chromium.org,mcrouse@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I9da5764c078264a93aa1e50118c0296055e4a7c8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1160424, 1166280
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627872Reviewed-by: François Doray <fdoray@chromium.org>
Commit-Queue: François Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843182}

chrome/renderer/BUILD.gn

@@ -161,6 +161,7 @@ static_library("renderer") {
     "//components/content_settings/renderer",
     "//components/contextual_search/content:renderer",
     "//components/data_reduction_proxy/core/common",
+    "//components/data_reduction_proxy/proto:subresource_redirect_proto",
     "//components/dom_distiller/content/renderer",
     "//components/network_hints/renderer",
     "//components/no_state_prefetch/common",
@@ -185,7 +186,6 @@ static_library("renderer") {
     "//components/subresource_filter/content/renderer",
     "//components/subresource_filter/core/common",
     "//components/subresource_redirect/common",
-    "//components/subresource_redirect/proto",
     "//components/sync/driver",
     "//components/translate/content/renderer",
     "//components/translate/core/common",

chrome/renderer/subresource_redirect/DEPS

 include_rules = [
   "+components/base32",
   "+services/metrics/public/cpp",
+  "+components/data_reduction_proxy/proto/robots_rules.pb.h",
   "+components/subresource_redirect",
-  "+components/subresource_redirect/proto/robots_rules.pb.h",
   "+services/network/test/test_utils.h",
 ]
 

chrome/renderer/subresource_redirect/robots_rules_parser.cc

@@ -12,7 +12,7 @@
 #include "base/time/time.h"
 #include "base/timer/elapsed_timer.h"
 #include "chrome/renderer/subresource_redirect/subresource_redirect_params.h"
-#include "components/subresource_redirect/proto/robots_rules.pb.h"
+#include "components/data_reduction_proxy/proto/robots_rules.pb.h"
 
 namespace subresource_redirect {
 

chrome/renderer/subresource_redirect/robots_rules_parser_unittest.cc

@@ -10,7 +10,7 @@
 #include "base/test/task_environment.h"
 #include "base/time/time.h"
 #include "chrome/renderer/subresource_redirect/robots_rules_parser.h"
-#include "components/subresource_redirect/proto/robots_rules.pb.h"
+#include "components/data_reduction_proxy/proto/robots_rules.pb.h"
 #include "components/subresource_redirect/subresource_redirect_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/features.h"

components/data_reduction_proxy/proto/BUILD.gn

@@ -10,3 +10,7 @@ proto_library("data_reduction_proxy_proto") {
     "data_store.proto",
   ]
 }
+
+proto_library("subresource_redirect_proto") {
+  sources = [ "robots_rules.proto" ]
+}

components/subresource_redirect/BUILD.gn

@@ -15,8 +15,8 @@ static_library("test_support") {
   deps = [
     "//base/test:test_support",
     "//chrome/common:constants",
+    "//components/data_reduction_proxy/proto:subresource_redirect_proto",
     "//components/metrics:content",
-    "//components/subresource_redirect/proto:proto",
     "//content/test:test_support",
     "//net:test_support",
     "//testing/gtest:gtest",

components/subresource_redirect/proto/BUILD.gn

-# Copyright 2021 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.
-
-import("//third_party/protobuf/proto_library.gni")
-
-proto_library("proto") {
-  sources = [ "robots_rules.proto" ]
-}

components/subresource_redirect/subresource_redirect_browser_test_util.cc

@@ -9,7 +9,6 @@
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/metrics/content/subprocess_metrics_provider.h"
-#include "components/subresource_redirect/proto/robots_rules.pb.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/url_util.h"
 #include "net/test/embedded_test_server/http_request.h"

components/subresource_redirect/subresource_redirect_test_util.cc

@@ -4,7 +4,7 @@
 
 #include "components/subresource_redirect/subresource_redirect_test_util.h"
 
-#include "components/subresource_redirect/proto/robots_rules.pb.h"
+#include "components/data_reduction_proxy/proto/robots_rules.pb.h"
 
 namespace subresource_redirect {