Cleanup record.proto location

The messages defined in record.proto will need to be available to
the server and the future daemon. Moving to the appropriate location.

Also - reporting_messaging_layer is far too long for a namespace.
Renamed to simply reporting. :-D

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

chrome/browser/BUILD.gn

@@ -1983,7 +1983,6 @@ static_library("browser") {
     ":expired_flags_list",
     ":ntp_background_proto",
     ":permissions_proto",
-    ":reporting_record_proto",
     ":resource_prefetch_predictor_proto",
     ":status_proto",
     ":tab_state_db_content_proto",
@@ -2133,6 +2132,7 @@ static_library("browser") {
     "//components/policy/core/browser",
     "//components/policy/proto",
     "//components/policy/proto:policy_record_constants",
+    "//components/policy/proto:reporting_record_proto",
     "//components/prefs",
     "//components/prerender/common",
     "//components/previews/content",
@@ -6211,12 +6211,6 @@ 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") {
   sources = [ "policy/messaging_layer/util/status.proto" ]
   generate_python = false

chrome/browser/policy/messaging_layer/proto/test.proto

@@ -6,7 +6,7 @@ syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
-package reporting_messaging_layer.test;
+package reporting.test;
 
 // A simple test proto with a string in it.
 message TestMessage {

chrome/browser/policy/messaging_layer/public/report_client_unittest.cc

@@ -18,8 +18,8 @@ namespace reporting {
 namespace {
 
 using policy::DMToken;
-using reporting_messaging_layer::Destination;
-using reporting_messaging_layer::Priority;
+using reporting::Destination;
+using reporting::Priority;
 
 class ReportingClientTest : public testing::Test {
  protected:

chrome/browser/policy/messaging_layer/public/report_queue.cc

@@ -18,21 +18,21 @@
 #include "base/task/thread_pool.h"
 #include "base/values.h"
 #include "chrome/browser/policy/messaging_layer/encryption/encryption_module.h"
-#include "chrome/browser/policy/messaging_layer/proto/record.pb.h"
 #include "chrome/browser/policy/messaging_layer/public/report_queue_configuration.h"
 #include "chrome/browser/policy/messaging_layer/storage/storage_module.h"
 #include "chrome/browser/policy/messaging_layer/util/status.h"
 #include "chrome/browser/policy/messaging_layer/util/status_macros.h"
 #include "chrome/browser/policy/messaging_layer/util/statusor.h"
 #include "components/policy/core/common/cloud/dm_token.h"
+#include "components/policy/proto/record.pb.h"
 #include "components/policy/proto/record_constants.pb.h"
 #include "crypto/sha2.h"
 
 namespace reporting {
 
-using reporting_messaging_layer::EncryptedRecord;
-using reporting_messaging_layer::Record;
-using reporting_messaging_layer::WrappedRecord;
+using reporting::EncryptedRecord;
+using reporting::Record;
+using reporting::WrappedRecord;
 
 std::unique_ptr<ReportQueue> ReportQueue::Create(
     std::unique_ptr<ReportQueueConfiguration> config,

chrome/browser/policy/messaging_layer/public/report_queue.h

@@ -15,11 +15,11 @@
 #include "base/sequenced_task_runner.h"
 #include "base/values.h"
 #include "chrome/browser/policy/messaging_layer/encryption/encryption_module.h"
-#include "chrome/browser/policy/messaging_layer/proto/record.pb.h"
 #include "chrome/browser/policy/messaging_layer/public/report_queue_configuration.h"
 #include "chrome/browser/policy/messaging_layer/storage/storage_module.h"
 #include "chrome/browser/policy/messaging_layer/util/status.h"
 #include "chrome/browser/policy/messaging_layer/util/statusor.h"
+#include "components/policy/proto/record.pb.h"
 #include "components/policy/proto/record_constants.pb.h"
 #include "third_party/protobuf/src/google/protobuf/message_lite.h"
 
@@ -80,11 +80,10 @@ class ReportQueue {
   Status AddRecord(base::StringPiece record, EnqueueCallback callback);
   void SendRecordToStorage(std::string record, EnqueueCallback callback);
 
-  StatusOr<reporting_messaging_layer::WrappedRecord> WrapRecord(
-      base::StringPiece record_data);
+  StatusOr<reporting::WrappedRecord> WrapRecord(base::StringPiece record_data);
   StatusOr<std::string> GetLastRecordDigest();
-  StatusOr<reporting_messaging_layer::EncryptedRecord> EncryptRecord(
-      reporting_messaging_layer::WrappedRecord wrapped_record);
+  StatusOr<reporting::EncryptedRecord> EncryptRecord(
+      reporting::WrappedRecord wrapped_record);
 
   std::unique_ptr<ReportQueueConfiguration> config_;
   scoped_refptr<StorageModule> storage_;

chrome/browser/policy/messaging_layer/public/report_queue_configuration.cc

@@ -14,8 +14,8 @@
 namespace reporting {
 
 using policy::DMToken;
-using reporting_messaging_layer::Destination;
-using reporting_messaging_layer::Priority;
+using reporting::Destination;
+using reporting::Priority;
 
 StatusOr<std::unique_ptr<ReportQueueConfiguration>>
 ReportQueueConfiguration::Create(const policy::DMToken& dm_token,

chrome/browser/policy/messaging_layer/public/report_queue_configuration.h

@@ -35,14 +35,12 @@ class ReportQueueConfiguration {
   // Priority::UNDEFINED_PRIORITY.
   static StatusOr<std::unique_ptr<ReportQueueConfiguration>> Create(
       const policy::DMToken& dm_token,
-      reporting_messaging_layer::Destination destination,
-      reporting_messaging_layer::Priority priority);
+      reporting::Destination destination,
+      reporting::Priority priority);
 
-  reporting_messaging_layer::Destination destination() const {
-    return destination_;
-  }
+  reporting::Destination destination() const { return destination_; }
 
-  reporting_messaging_layer::Priority priority() const { return priority_; }
+  reporting::Priority priority() const { return priority_; }
 
   policy::DMToken dm_token() const { return dm_token_; }
 
@@ -50,12 +48,12 @@ class ReportQueueConfiguration {
   ReportQueueConfiguration() = default;
 
   Status SetDMToken(const policy::DMToken& dm_token);
-  Status SetDestination(reporting_messaging_layer::Destination destination);
-  Status SetPriority(reporting_messaging_layer::Priority priority);
+  Status SetDestination(reporting::Destination destination);
+  Status SetPriority(reporting::Priority priority);
 
   policy::DMToken dm_token_;
-  reporting_messaging_layer::Destination destination_;
-  reporting_messaging_layer::Priority priority_;
+  reporting::Destination destination_;
+  reporting::Priority priority_;
 };
 
 }  // namespace reporting

chrome/browser/policy/messaging_layer/public/report_queue_configuration_unittest.cc

@@ -15,8 +15,8 @@ namespace reporting {
 namespace {
 
 using policy::DMToken;
-using reporting_messaging_layer::Destination;
-using reporting_messaging_layer::Priority;
+using reporting::Destination;
+using reporting::Priority;
 
 // Tests to ensure that only valid parameters are used to generate a
 // ReportQueueConfiguration.

chrome/browser/policy/messaging_layer/public/report_queue_unittest.cc

@@ -31,10 +31,10 @@ namespace {
 
 using base::MakeRefCounted;
 using policy::DMToken;
-using reporting_messaging_layer::Destination;
-using reporting_messaging_layer::EncryptedRecord;
-using reporting_messaging_layer::Priority;
-using reporting_messaging_layer::WrappedRecord;
+using reporting::Destination;
+using reporting::EncryptedRecord;
+using reporting::Priority;
+using reporting::WrappedRecord;
 
 // A |StorageModule| that stores the wrapped record and priority and calls the
 // callback with an OK status.
@@ -197,7 +197,7 @@ TEST_F(ReportQueueTest, SuccessfulBaseValueRecord) {
 // Enqueues a |TestMessage| and ensures that it arrives unaltered in the
 // |StorageModule|.
 TEST_F(ReportQueueTest, SuccessfulProtoRecord) {
-  reporting_messaging_layer::test::TestMessage test_message;
+  reporting::test::TestMessage test_message;
   test_message.set_test("TEST_MESSAGE");
   Status status = report_queue_->Enqueue(&test_message, std::move(callback_));
   ASSERT_TRUE(status.ok());
@@ -208,7 +208,7 @@ TEST_F(ReportQueueTest, SuccessfulProtoRecord) {
 
   EXPECT_EQ(storage_module_->priority(), priority_);
 
-  reporting_messaging_layer::test::TestMessage result_message;
+  reporting::test::TestMessage result_message;
   ASSERT_TRUE(result_message.ParseFromString(
       storage_module_->wrapped_record().record().data()));
   ASSERT_EQ(result_message.test(), test_message.test());
@@ -240,7 +240,7 @@ class StorageFailsReportQueueTest : public ReportQueueTest {
 // been scheduled. The callback should fail, indicating that storage was
 // unsuccessful.
 TEST_F(StorageFailsReportQueueTest, CallSuccessCallbackFailure) {
-  reporting_messaging_layer::test::TestMessage test_message;
+  reporting::test::TestMessage test_message;
   test_message.set_test("TEST_MESSAGE");
   Status status = report_queue_->Enqueue(&test_message, std::move(callback_));
   ASSERT_TRUE(status.ok());
@@ -275,7 +275,7 @@ class EncryptionFailsReportQueueTest : public ReportQueueTest {
 // has been scheduled. The callback should fail, indicating that encryption was
 // unsuccessful.
 TEST_F(EncryptionFailsReportQueueTest, CallSuccessCallFailure) {
-  reporting_messaging_layer::test::TestMessage test_message;
+  reporting::test::TestMessage test_message;
   test_message.set_test("TEST_MESSAGE");
   Status status = report_queue_->Enqueue(&test_message, std::move(callback_));
   ASSERT_TRUE(status.ok());

chrome/browser/policy/messaging_layer/storage/storage_module.cc

@@ -5,15 +5,15 @@
 #include <utility>
 
 #include "base/callback.h"
-#include "chrome/browser/policy/messaging_layer/proto/record.pb.h"
 #include "chrome/browser/policy/messaging_layer/storage/storage_module.h"
 #include "chrome/browser/policy/messaging_layer/util/status.h"
+#include "components/policy/proto/record.pb.h"
 #include "components/policy/proto/record_constants.pb.h"
 
 namespace reporting {
 
-void StorageModule::AddRecord(reporting_messaging_layer::EncryptedRecord record,
-                              reporting_messaging_layer::Priority priority,
+void StorageModule::AddRecord(reporting::EncryptedRecord record,
+                              reporting::Priority priority,
                               base::OnceCallback<void(Status)> callback) {
   std::move(callback).Run(
       Status(error::UNIMPLEMENTED, "AddRecord isn't implemented"));

chrome/browser/policy/messaging_layer/storage/storage_module.h

@@ -9,8 +9,8 @@
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/policy/messaging_layer/proto/record.pb.h"
 #include "chrome/browser/policy/messaging_layer/util/status.h"
+#include "components/policy/proto/record.pb.h"
 #include "components/policy/proto/record_constants.pb.h"
 
 namespace reporting {
@@ -25,8 +25,8 @@ class StorageModule : public base::RefCounted<StorageModule> {
 
   // AddRecord will add |record| to the |StorageModule| according to the
   // provided |priority|. On completion, |callback| will be called.
-  virtual void AddRecord(reporting_messaging_layer::EncryptedRecord record,
-                         reporting_messaging_layer::Priority priority,
+  virtual void AddRecord(reporting::EncryptedRecord record,
+                         reporting::Priority priority,
                          base::OnceCallback<void(Status)> callback);
 
  protected:

chrome/browser/policy/messaging_layer/storage/test_storage_module.cc

@@ -7,16 +7,16 @@
 #include <utility>
 
 #include "base/callback.h"
-#include "chrome/browser/policy/messaging_layer/proto/record.pb.h"
 #include "chrome/browser/policy/messaging_layer/public/report_queue.h"
+#include "components/policy/proto/record.pb.h"
 #include "components/policy/proto/record_constants.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace reporting {
 namespace test {
 
-using reporting_messaging_layer::EncryptedRecord;
-using reporting_messaging_layer::Priority;
+using reporting::EncryptedRecord;
+using reporting::Priority;
 
 void TestStorageModule::AddRecord(EncryptedRecord record,
                                   Priority priority,

chrome/browser/policy/messaging_layer/storage/test_storage_module.h

@@ -8,8 +8,8 @@
 #include <utility>
 
 #include "base/callback.h"
-#include "chrome/browser/policy/messaging_layer/proto/record.pb.h"
 #include "chrome/browser/policy/messaging_layer/public/report_queue.h"
+#include "components/policy/proto/record.pb.h"
 #include "components/policy/proto/record_constants.pb.h"
 
 namespace reporting {
@@ -21,22 +21,20 @@ class TestStorageModule : public StorageModule {
  public:
   TestStorageModule() = default;
 
-  void AddRecord(reporting_messaging_layer::EncryptedRecord record,
-                 reporting_messaging_layer::Priority priority,
+  void AddRecord(reporting::EncryptedRecord record,
+                 reporting::Priority priority,
                  base::OnceCallback<void(Status)> callback) override;
 
-  reporting_messaging_layer::WrappedRecord wrapped_record() {
-    return wrapped_record_;
-  }
+  reporting::WrappedRecord wrapped_record() { return wrapped_record_; }
 
-  reporting_messaging_layer::Priority priority() { return priority_; }
+  reporting::Priority priority() { return priority_; }
 
  protected:
   ~TestStorageModule() override = default;
 
  private:
-  reporting_messaging_layer::WrappedRecord wrapped_record_;
-  reporting_messaging_layer::Priority priority_;
+  reporting::WrappedRecord wrapped_record_;
+  reporting::Priority priority_;
 };
 
 // A |TestStorageModule| that always fails on |AddRecord| calls.
@@ -44,8 +42,8 @@ class AlwaysFailsStorageModule final : public TestStorageModule {
  public:
   AlwaysFailsStorageModule() = default;
 
-  void AddRecord(reporting_messaging_layer::EncryptedRecord record,
-                 reporting_messaging_layer::Priority priority,
+  void AddRecord(reporting::EncryptedRecord record,
+                 reporting::Priority priority,
                  base::OnceCallback<void(Status)> callback) override;
 
  protected:

components/policy/proto/BUILD.gn

@@ -17,14 +17,24 @@ component("proto") {
 proto_library("policy_record_constants") {
   visibility = [
     "//chrome/browser:browser",
-    "//chrome/browser:reporting_record_proto",
-    "//chrome/browser:reporting_record_proto_gen",
+    ":reporting_record_proto",
+    ":reporting_record_proto_gen",
   ]
   sources = [ "record_constants.proto" ]
 
   proto_out_dir = "components/policy/proto"
 }
 
+# Record definitions for reporting.
+proto_library("reporting_record_proto") {
+  visibility = [ "//chrome/browser:browser" ]
+  sources = [ "record.proto" ]
+
+  deps = [ ":policy_record_constants" ]
+
+  proto_out_dir = "components/policy/proto"
+}
+
 proto_library("policy_common_definitions_compile_proto") {
   visibility = [
     "//components/policy:cloud_policy_proto_generated_compile_proto",

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

@@ -6,9 +6,9 @@ syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
-package reporting_messaging_layer;
+package reporting;
 
-import "components/policy/proto/record_constants.proto";
+import "record_constants.proto";
 
 // Record represents the data sent from the Reporting Client.
 message Record {

components/policy/proto/record_constants.proto

@@ -6,7 +6,7 @@ syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
-package reporting_messaging_layer;
+package reporting;
 
 // |Destination| indicates which handler a |Record| should be delivered to.
 enum Destination {