Move report_queue_configuration to components.

Bug: b:180417849 Change-Id: I4273db13a4b08783dcbd1608521a1fd907bf4bdb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2728884 Commit-Queue: Leonid Baraz <lbaraz@chromium.org> Reviewed-by: Zach Trudo <zatrudo@google.com> Reviewed-by: Ted Choc <tedchoc@chromium.org> Reviewed-by: Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/master@{#859823}
marcosholgado · Mar 4, 2021 · caac7c9 · caac7c9
1 parent 2dc9e1c
commit caac7c9
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 18 deletions.
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -1209,8 +1209,6 @@ static_library("browser") {
     "policy/javascript_policy_handler.h",
     "policy/messaging_layer/public/report_client.cc",
     "policy/messaging_layer/public/report_client.h",
-    "policy/messaging_layer/public/report_queue_configuration.cc",
-    "policy/messaging_layer/public/report_queue_configuration.h",
     "policy/messaging_layer/public/report_queue_impl.cc",
     "policy/messaging_layer/public/report_queue_impl.h",
     "policy/messaging_layer/upload/dm_server_upload_service.cc",
@@ -2160,6 +2158,7 @@ static_library("browser") {
     "//components/reading_list/features:flags",
     "//components/renderer_context_menu",
     "//components/reporting/client:report_queue",
+    "//components/reporting/client:report_queue_configuration",
     "//components/reporting/encryption:encryption_module",
     "//components/reporting/encryption:verification",
     "//components/reporting/proto:record_constants",

diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
@@ -309,6 +309,7 @@ source_set("chromeos") {
     "//components/quirks",
     "//components/renderer_context_menu",
     "//components/reporting/client:report_queue",
+    "//components/reporting/client:report_queue_configuration",
     "//components/reporting/util:status",
     "//components/reporting/util:task_runner_context",
     "//components/rlz",
@@ -3220,6 +3221,7 @@ source_set("chromeos") {
       "//chromeos/services/chromebox_for_meetings/public/cpp",
       "//chromeos/services/chromebox_for_meetings/public/mojom",
       "//components/reporting/client:report_queue",
+      "//components/reporting/client:report_queue_configuration",
       "//components/reporting/proto:record_constants",
       "//components/variations/field_trial_config",
     ]

diff --git a/chrome/browser/policy/messaging_layer/public/report_client.cc b/chrome/browser/policy/messaging_layer/public/report_client.cc
@@ -19,7 +19,6 @@
 #include "base/threading/sequence_bound.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/net/system_network_context_manager.h"
-#include "chrome/browser/policy/messaging_layer/public/report_queue_configuration.h"
 #include "chrome/browser/policy/messaging_layer/public/report_queue_impl.h"
 #include "chrome/browser/policy/messaging_layer/util/get_cloud_policy_client.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -30,6 +29,7 @@
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_manager.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
+#include "components/reporting/client/report_queue_configuration.h"
 #include "components/reporting/encryption/verification.h"
 #include "components/reporting/proto/record.pb.h"
 #include "components/reporting/storage/storage_configuration.h"

diff --git a/chrome/browser/policy/messaging_layer/public/report_client.h b/chrome/browser/policy/messaging_layer/public/report_client.h
@@ -10,10 +10,10 @@
 
 #include "base/feature_list.h"
 #include "base/memory/singleton.h"
-#include "chrome/browser/policy/messaging_layer/public/report_queue_configuration.h"
 #include "chrome/browser/policy/messaging_layer/public/report_queue_impl.h"
 #include "chrome/browser/policy/messaging_layer/upload/upload_client.h"
 #include "components/reporting//proto/record.pb.h"
+#include "components/reporting/client/report_queue_configuration.h"
 #include "components/reporting/storage/storage_module_interface.h"
 #include "components/reporting/storage/storage_uploader_interface.h"
 #include "components/reporting/util/shared_queue.h"

diff --git a/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc b/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc
@@ -10,9 +10,9 @@
 #include "base/test/task_environment.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
-#include "chrome/browser/policy/messaging_layer/public/report_queue_configuration.h"
 #include "chrome/browser/policy/messaging_layer/public/report_queue_impl.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
+#include "components/reporting/client/report_queue_configuration.h"
 #include "components/reporting/proto/record_constants.pb.h"
 #include "components/reporting/util/status.h"
 #include "components/reporting/util/status_macros.h"

diff --git a/chrome/browser/policy/messaging_layer/public/report_queue_impl.cc b/chrome/browser/policy/messaging_layer/public/report_queue_impl.cc
@@ -20,8 +20,8 @@
 #include "base/task/thread_pool.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/policy/messaging_layer/public/report_queue_configuration.h"
 #include "components/policy/core/common/cloud/dm_token.h"
+#include "components/reporting/client/report_queue_configuration.h"
 #include "components/reporting/encryption/encryption_module.h"
 #include "components/reporting/proto/record.pb.h"
 #include "components/reporting/proto/record_constants.pb.h"

diff --git a/chrome/browser/policy/messaging_layer/public/report_queue_impl.h b/chrome/browser/policy/messaging_layer/public/report_queue_impl.h
@@ -15,8 +15,8 @@
 #include "base/sequence_checker.h"
 #include "base/sequenced_task_runner.h"
 #include "base/values.h"
-#include "chrome/browser/policy/messaging_layer/public/report_queue_configuration.h"
 #include "components/reporting/client/report_queue.h"
+#include "components/reporting/client/report_queue_configuration.h"
 #include "components/reporting/proto/record.pb.h"
 #include "components/reporting/proto/record_constants.pb.h"
 #include "components/reporting/storage/storage_module_interface.h"

diff --git a/chrome/browser/policy/messaging_layer/public/report_queue_impl_unittest.cc b/chrome/browser/policy/messaging_layer/public/report_queue_impl_unittest.cc
@@ -15,7 +15,7 @@
 #include "base/test/task_environment.h"
 #include "base/values.h"
 #include "chrome/browser/policy/messaging_layer/proto/test.pb.h"
-#include "chrome/browser/policy/messaging_layer/public/report_queue_configuration.h"
+#include "components/reporting/client/report_queue_configuration.h"
 #include "components/reporting/proto/record_constants.pb.h"
 #include "components/reporting/storage/storage_module_interface.h"
 #include "components/reporting/storage/test_storage_module.h"
@@ -98,7 +98,7 @@ class ReportQueueImplTest : public testing::Test {
 
     ASSERT_TRUE(config_result.ok());
 
-    StatusOr<std::unique_ptr<ReportQueueImpl>> report_queue_result =
+    StatusOr<std::unique_ptr<ReportQueue>> report_queue_result =
         ReportQueueImpl::Create(std::move(config_result.ValueOrDie()),
                                 storage_module_);
 
@@ -120,7 +120,7 @@ class ReportQueueImplTest : public testing::Test {
 
   const Priority priority_;
 
-  std::unique_ptr<ReportQueueImpl> report_queue_;
+  std::unique_ptr<ReportQueue> report_queue_;
   base::OnceCallback<void(Status)> callback_;
 
  private:

diff --git a/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.cc b/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.cc
@@ -12,10 +12,10 @@
 #include "base/time/time.h"
 #include "chrome/browser/policy/dm_token_utils.h"
 #include "chrome/browser/policy/messaging_layer/public/report_client.h"
-#include "chrome/browser/policy/messaging_layer/public/report_queue_configuration.h"
 #include "chrome/browser/policy/messaging_layer/public/report_queue_impl.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/policy/core/common/cloud/dm_token.h"
+#include "components/reporting/client/report_queue_configuration.h"
 #include "components/reporting/proto/record_constants.pb.h"
 #include "components/reporting/util/status.h"
 #include "components/reporting/util/task_runner_context.h"

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -3694,7 +3694,6 @@ test("unit_tests") {
     "../browser/policy/homepage_location_policy_handler_unittest.cc",
     "../browser/policy/javascript_policy_handler_unittest.cc",
     "../browser/policy/messaging_layer/public/report_client_unittest.cc",
-    "../browser/policy/messaging_layer/public/report_queue_configuration_unittest.cc",
     "../browser/policy/messaging_layer/public/report_queue_impl_unittest.cc",
     "../browser/policy/messaging_layer/upload/dm_server_upload_service_unittest.cc",
     "../browser/policy/messaging_layer/upload/record_handler_impl_unittest.cc",

diff --git a/components/reporting/client/BUILD.gn b/components/reporting/client/BUILD.gn
@@ -5,12 +5,27 @@
 import("//build/config/features.gni")
 import("//third_party/protobuf/proto_library.gni")
 
+static_library("report_queue_configuration") {
+  sources = [
+    "report_queue_configuration.cc",
+    "report_queue_configuration.h",
+  ]
+  deps = [
+    "//base",
+    "//components/reporting/proto:record_constants",
+    "//components/reporting/proto:record_proto",
+    "//components/reporting/util:status",
+    "//components/reporting/util:status_macros",
+  ]
+}
+
 static_library("report_queue") {
   sources = [
     "report_queue.cc",
     "report_queue.h",
   ]
   deps = [
+    ":report_queue_configuration",
     "//base",
     "//components/reporting/proto:record_constants",
     "//components/reporting/proto:record_proto",
@@ -43,12 +58,17 @@ static_library("test_support") {
 # target and must be one targets named "unit_tests".
 source_set("unit_tests") {
   testonly = true
-  sources = [ "report_queue_unittest.cc" ]
+  sources = [
+    "report_queue_configuration_unittest.cc",
+    "report_queue_unittest.cc",
+  ]
   deps = [
     ":report_queue",
+    ":report_queue_configuration",
     ":test_support",
     "//base",
     "//base/test:test_support",
+    "//components/reporting/proto:record_constants",
     "//components/reporting/proto:record_proto",
     "//components/reporting/util:status",
     "//components/reporting/util:status_macros",

diff --git a/...ayer/public/report_queue_configuration.cc → ...ting/client/report_queue_configuration.cc b/...ayer/public/report_queue_configuration.cc → ...ting/client/report_queue_configuration.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/policy/messaging_layer/public/report_queue_configuration.h"
+#include "components/reporting/client/report_queue_configuration.h"
 
 #include <utility>
 

diff --git a/...layer/public/report_queue_configuration.h → ...rting/client/report_queue_configuration.h b/...layer/public/report_queue_configuration.h → ...rting/client/report_queue_configuration.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_POLICY_MESSAGING_LAYER_PUBLIC_REPORT_QUEUE_CONFIGURATION_H_
-#define CHROME_BROWSER_POLICY_MESSAGING_LAYER_PUBLIC_REPORT_QUEUE_CONFIGURATION_H_
+#ifndef COMPONENTS_REPORTING_CLIENT_REPORT_QUEUE_CONFIGURATION_H_
+#define COMPONENTS_REPORTING_CLIENT_REPORT_QUEUE_CONFIGURATION_H_
 
 #include <memory>
 #include <utility>
@@ -64,4 +64,4 @@ class ReportQueueConfiguration {
 
 }  // namespace reporting
 
-#endif  // CHROME_BROWSER_POLICY_MESSAGING_LAYER_PUBLIC_REPORT_QUEUE_CONFIGURATION_H_
+#endif  // COMPONENTS_REPORTING_CLIENT_REPORT_QUEUE_CONFIGURATION_H_
diff --git a/...ic/report_queue_configuration_unittest.cc → ...nt/report_queue_configuration_unittest.cc b/...ic/report_queue_configuration_unittest.cc → ...nt/report_queue_configuration_unittest.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/policy/messaging_layer/public/report_queue_configuration.h"
+#include "components/reporting/client/report_queue_configuration.h"
 
 #include <stdio.h>