Move sharing messages to sync protocol directory.

Reland of https://chromium-review.googlesource.com/c/chromium/src/+/1890410

Fixed the includes.

Bug: 1018129
Change-Id: Icf2f66ba71bb723bb495ec6ab756fcae5a1f59a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1890314
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Reviewed-by: Richard Knoll <knollr@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710835}

chrome/browser/BUILD.gn

@@ -1933,7 +1933,6 @@ jumbo_static_library("browser") {
     "//chrome/browser/resource_coordinator:mojo_bindings",
     "//chrome/browser/resource_coordinator:tab_manager_features",
     "//chrome/browser/safe_browsing",
-    "//chrome/browser/sharing/proto",
     "//chrome/browser/ssl:proto",
     "//chrome/browser/touch_to_fill",
     "//chrome/browser/ui",

chrome/browser/sharing/ack_message_handler.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/sharing/ack_message_handler.h"
 
 #include "base/memory/ptr_util.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 
 AckMessageHandler::AckMessageHandler(
     ResponseCallbackHelper* response_callback_helper)

chrome/browser/sharing/ack_message_handler_unittest.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/test/mock_callback.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.cc

@@ -7,8 +7,8 @@
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "chrome/android/chrome_jni_headers/ClickToCallMessageHandler_jni.h"
-#include "chrome/browser/sharing/proto/click_to_call_message.pb.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
+#include "components/sync/protocol/sharing_click_to_call_message.pb.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 
 ClickToCallMessageHandler::ClickToCallMessageHandler() = default;
 

chrome/browser/sharing/ping_message_handler.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/sharing/ping_message_handler.h"
 
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 
 PingMessageHandler::PingMessageHandler() = default;
 

chrome/browser/sharing/proto/BUILD.gn

-# Copyright 2019 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")
-
-group("proto_lite") {
-  public_deps = [
-    ":proto",
-    "//third_party/protobuf:protobuf_lite",
-  ]
-}
-
-proto_library("proto") {
-  sources = [
-    "click_to_call_message.proto",
-    "shared_clipboard_message.proto",
-    "sharing_message.proto",
-    "sms_fetch_message.proto",
-  ]
-}

chrome/browser/sharing/response_callback_helper.cc

@@ -5,9 +5,9 @@
 #include "chrome/browser/sharing/response_callback_helper.h"
 
 #include "base/callback.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_metrics.h"
 #include "chrome/browser/sharing/sharing_send_message_result.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 
 ResponseCallbackHelper::ResponseCallbackHelper() = default;
 ResponseCallbackHelper::~ResponseCallbackHelper() = default;

chrome/browser/sharing/response_callback_helper_unittest.cc

@@ -12,8 +12,8 @@
 #include "base/test/bind_test_util.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/mock_callback.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_send_message_result.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(ResponseCallbackHelperTest, RunCallbackForUnregisteredGUID) {

chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler.cc

@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/sharing/proto/shared_clipboard_message.pb.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_service.h"
+#include "components/sync/protocol/sharing_message.pb.h"
+#include "components/sync/protocol/sharing_shared_clipboard_message.pb.h"
 #include "components/sync_device_info/device_info.h"
 #include "ui/base/clipboard/clipboard_buffer.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"

chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop_unittest.cc

@@ -11,10 +11,10 @@
 #include "base/test/mock_callback.h"
 #include "chrome/browser/notifications/stub_notification_display_service.h"
 #include "chrome/browser/sharing/mock_sharing_service.h"
-#include "chrome/browser/sharing/proto/shared_clipboard_message.pb.h"
 #include "chrome/browser/sharing/sharing_service_factory.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/sync/protocol/sharing_shared_clipboard_message.pb.h"
 #include "components/sync/protocol/sync_enums.pb.h"
 #include "components/sync_device_info/device_info.h"
 #include "content/public/test/browser_task_environment.h"

chrome/browser/sharing/sharing_fcm_handler.h

@@ -11,9 +11,9 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_send_message_result.h"
 #include "components/gcm_driver/gcm_app_handler.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 #include "components/sync_device_info/device_info.h"
 
 namespace gcm {

chrome/browser/sharing/sharing_fcm_sender.h

@@ -14,9 +14,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/time/time.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_send_message_result.h"
 #include "components/gcm_driver/web_push_common.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 #include "components/sync_device_info/device_info.h"
 
 namespace gcm {

chrome/browser/sharing/sharing_metrics.h

@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/time/time.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_constants.h"
 #include "chrome/browser/sharing/sharing_send_message_result.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 
 namespace content {
 class WebContents;

chrome/browser/sharing/sharing_service.h

@@ -16,7 +16,6 @@
 #include "build/build_config.h"
 #include "chrome/browser/sharing/ack_message_handler.h"
 #include "chrome/browser/sharing/ping_message_handler.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/response_callback_helper.h"
 #include "chrome/browser/sharing/sharing_device_registration.h"
 #include "chrome/browser/sharing/sharing_send_message_result.h"
@@ -25,6 +24,7 @@
 #include "components/sync/base/model_type.h"
 #include "components/sync/driver/sync_service_observer.h"
 #include "components/sync/protocol/device_info_specifics.pb.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 #include "components/sync_device_info/device_info_tracker.h"
 #include "components/sync_device_info/local_device_info_provider.h"
 #include "net/base/backoff_entry.h"

chrome/browser/sharing/sharing_service_unittest.cc

@@ -13,7 +13,6 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/test/task_environment.h"
 #include "chrome/browser/sharing/features.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_constants.h"
 #include "chrome/browser/sharing/sharing_device_registration.h"
 #include "chrome/browser/sharing/sharing_device_registration_result.h"
@@ -25,6 +24,7 @@
 #include "components/gcm_driver/fake_gcm_driver.h"
 #include "components/gcm_driver/instance_id/instance_id_driver.h"
 #include "components/sync/driver/test_sync_service.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 #include "components/sync_device_info/device_info.h"
 #include "components/sync_device_info/fake_device_info_sync_service.h"
 #include "components/sync_device_info/local_device_info_provider.h"

chrome/browser/sharing/sharing_ui_controller.h

@@ -14,7 +14,6 @@
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_app.h"
 #include "chrome/browser/sharing/sharing_constants.h"
 #include "chrome/browser/sharing/sharing_dialog_data.h"
@@ -22,6 +21,7 @@
 #include "chrome/browser/sharing/sharing_service.h"
 #include "chrome/browser/ui/page_action/page_action_icon_type.h"
 #include "components/sync/protocol/device_info_specifics.pb.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 #include "components/sync_device_info/device_info.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/styled_label_listener.h"

chrome/browser/sharing/sms/sms_fetch_request_handler.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/sharing/sms/sms_fetch_request_handler.h"
 
 #include "base/logging.h"
-#include "chrome/browser/sharing/proto/sms_fetch_message.pb.h"
+#include "components/sync/protocol/sharing_sms_fetch_message.pb.h"
 
 SmsFetchRequestHandler::SmsFetchRequestHandler() = default;
 

chrome/browser/sharing/sms/sms_fetch_request_handler.h

@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_SHARING_SMS_SMS_FETCH_REQUEST_HANDLER_H_
 
 #include "base/macros.h"
-#include "chrome/browser/sharing/proto/sharing_message.pb.h"
 #include "chrome/browser/sharing/sharing_message_handler.h"
+#include "components/sync/protocol/sharing_message.pb.h"
 
 // Handles incoming messages for the sms fetcher feature.
 class SmsFetchRequestHandler : public SharingMessageHandler {

components/sync/protocol/OWNERS

@@ -2,3 +2,5 @@ markusheintz@chromium.org
 mastiz@chromium.org
 treib@chromium.org
 tschumann@chromium.org
+
+per-file sharing_*=file://chrome/browser/sharing/OWNERS

components/sync/protocol/protocol_sources.gni

@@ -50,6 +50,10 @@ sync_protocol_bases = [
   "security_event_specifics",
   "send_tab_to_self_specifics",
   "session_specifics",
+  "sharing_click_to_call_message",
+  "sharing_message",
+  "sharing_shared_clipboard_message",
+  "sharing_sms_fetch_message",
   "sync",
   "sync_enums",
   "synced_notification_app_info_specifics",

chrome/browser/sharing/proto/sharing_message.proto → components/sync/protocol/sharing_message.proto

@@ -4,9 +4,9 @@
 
 syntax = "proto3";
 
-import "click_to_call_message.proto";
-import "shared_clipboard_message.proto";
-import "sms_fetch_message.proto";
+import "sharing_click_to_call_message.proto";
+import "sharing_shared_clipboard_message.proto";
+import "sharing_sms_fetch_message.proto";
 
 package chrome_browser_sharing;