Fix record.proto dependencies

Previously record.proto wasn't depending on record_constants.proto.

Bug: chromium:1078512
Change-Id: I62616eb92c09c3c81859fc6e5aaa1b5968cc692b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2186115
Commit-Queue: Zach Trudo <zatrudo@google.com>
Auto-Submit: Zach Trudo <zatrudo@google.com>
Reviewed-by: Sergey Poromov <poromov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#766510}

chrome/browser/BUILD.gn

@@ -2112,6 +2112,7 @@ jumbo_static_library("browser") {
     "//components/policy/content/",
     "//components/policy/core/browser",
     "//components/policy/proto",
+    "//components/policy/proto:policy_record_constants",
     "//components/prefs",
     "//components/previews/content",
     "//components/previews/core",
@@ -6139,7 +6140,9 @@ if (is_android) {
 }
 
 proto_library("reporting_record_proto") {
+  proto_in_dir = "//"
   sources = [ "policy/messaging_layer/proto/record.proto" ]
+  deps = [ "//components/policy/proto:policy_record_constants" ]
 }
 
 proto_library("status_proto") {

chrome/browser/policy/messaging_layer/proto/record.proto

@@ -8,6 +8,8 @@ option optimize_for = LITE_RUNTIME;
 
 package reporting_messaging_layer;
 
+import "components/policy/proto/record_constants.proto";
+
 // Record represents the data sent from the Reporting Client.
 message Record {
   // Record data as enqueued with an ReportingQueue::Enqueue call (required).
@@ -18,11 +20,11 @@ message Record {
   //
   // Current expected formats (destination : type):
   // Destination::UPLOAD_EVENTS : UploadEventsRequest
-  optional bytes data = 1 [ctype = CORD];
+  optional string data = 1;
 
   // The destination associated with this request as set with the
   // ReportingQueueConfiguration (required).
-  optional string destination = 2;
+  optional Destination destination = 2;
 
   // The DMToken associated with this request as set with the
   // ReportingQueueConfiuguration (required).

components/policy/proto/BUILD.gn

@@ -13,6 +13,18 @@ component("proto") {
   public_deps = [ ":proto_internal" ]
 }
 
+# Record constants for use with the reporting messaging library.
+proto_library("policy_record_constants") {
+  visibility = [
+    "//chrome/browser:browser",
+    "//chrome/browser:reporting_record_proto",
+    "//chrome/browser:reporting_record_proto_gen",
+  ]
+  sources = [ "record_constants.proto" ]
+
+  proto_out_dir = "components/policy/proto"
+}
+
 proto_library("policy_common_definitions_compile_proto") {
   visibility = [
     "//components/policy:cloud_policy_proto_generated_compile_proto",
@@ -21,10 +33,7 @@ proto_library("policy_common_definitions_compile_proto") {
     ":proto_internal",
   ]
 
-  sources = [
-    "policy_common_definitions.proto",
-    "record_constants.proto",
-  ]
+  sources = [ "policy_common_definitions.proto" ]
 
   proto_out_dir = "components/policy/proto"
 }