[iOS CBCM] Move report_request_definition to components/enterprise

Moves report_request_definition namespace to components/enterprise. It
had previously been moved to components/policy, but it makes more sense
to keep reporting code under components/enterprise.

Bug: 1091914
Change-Id: I7aaaabc10c3f1efba152465c1405ebe90b42c96d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2258676
Commit-Queue: Guillaume Jenkins <gujen@google.com>
Reviewed-by: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781347}

chrome/browser/enterprise/reporting/report_generator.h

@@ -13,7 +13,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/enterprise/reporting/browser_report_generator.h"
 #include "chrome/browser/enterprise/reporting/report_request_queue_generator.h"
-#include "components/policy/core/common/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_request_definition.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 
 namespace enterprise_reporting {

chrome/browser/enterprise/reporting/report_generator_unittest.cc

@@ -18,7 +18,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/account_id/account_id.h"
-#include "components/policy/core/common/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_request_definition.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/webplugininfo.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/enterprise/reporting/report_request_queue_generator.h

@@ -12,7 +12,7 @@
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/enterprise/reporting/profile_report_generator.h"
-#include "components/policy/core/common/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_request_definition.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 
 namespace enterprise_reporting {

chrome/browser/enterprise/reporting/report_request_queue_generator_unittest.cc

@@ -16,9 +16,9 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/account_id/account_id.h"
+#include "components/enterprise/browser/reporting/report_request_definition.h"
 #include "components/policy/core/common/mock_policy_service.h"
 #include "components/policy/core/common/policy_map.h"
-#include "components/policy/core/common/reporting/report_request_definition.h"
 #include "components/sync_preferences/pref_service_syncable.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/enterprise/reporting/report_uploader.h

@@ -11,7 +11,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
-#include "components/policy/core/common/reporting/report_request_definition.h"
+#include "components/enterprise/browser/reporting/report_request_definition.h"
 #include "net/base/backoff_entry.h"
 
 namespace base {

components/enterprise/BUILD.gn

@@ -6,6 +6,7 @@ static_library("enterprise") {
   sources = [
     "browser/reporting/policy_info.cc",
     "browser/reporting/policy_info.h",
+    "browser/reporting/report_request_definition.h",
   ]
 
   deps = [

components/policy/core/common/reporting/report_request_definition.h → components/enterprise/browser/reporting/report_request_definition.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_POLICY_CORE_COMMON_REPORTING_REPORT_REQUEST_DEFINITION_H_
-#define COMPONENTS_POLICY_CORE_COMMON_REPORTING_REPORT_REQUEST_DEFINITION_H_
+#ifndef COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_DEFINITION_H_
+#define COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_DEFINITION_H_
 
 #include "build/build_config.h"
 #include "components/policy/proto/device_management_backend.pb.h"
@@ -26,4 +26,4 @@ using ReportRequest = enterprise_management::ChromeDesktopReportRequest;
 
 }  // namespace enterprise_reporting
 
-#endif  // COMPONENTS_POLICY_CORE_COMMON_REPORTING_REPORT_REQUEST_DEFINITION_H_
+#endif  // COMPONENTS_ENTERPRISE_BROWSER_REPORTING_REPORT_REQUEST_DEFINITION_H_

components/policy/core/common/BUILD.gn

@@ -141,7 +141,6 @@ jumbo_source_set("internal") {
     "remote_commands/remote_commands_queue.h",
     "remote_commands/remote_commands_service.cc",
     "remote_commands/remote_commands_service.h",
-    "reporting/report_request_definition.h",
     "schema.cc",
     "schema.h",
     "schema_internal.h",