Remove import_dirs from sync dependent proto targets

The affected targets are:
* components/send_tab_to_self/proto:send_tab_to_self_proto
* chrome/browser/web_applications/proto

Various sync .proto file imports were updated by running:
find components/sync/protocol/ | grep "\.proto$" | xargs sed -i 's/import \"/import \"components\/sync\/protocol\//g'

Bug: 1039009
Change-Id: I56bfae1ae47608bc3c4c4d27ea14f8cd13e8f43c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1988862
Commit-Queue: Sky Malice <skym@chromium.org>
Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: vitaliii <vitaliii@chromium.org>
Reviewed-by: sebsg <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738374}

chrome/browser/web_applications/proto/BUILD.gn

@@ -5,7 +5,7 @@
 import("//third_party/protobuf/proto_library.gni")
 
 proto_library("proto") {
-  import_dirs = [ "//components/sync/protocol" ]
+  proto_in_dir = "//"
   sources = [ "web_app.proto" ]
   link_deps = [ "//components/sync/protocol" ]
 }

chrome/browser/web_applications/proto/web_app.proto

@@ -4,7 +4,7 @@
 
 syntax = "proto2";
 
-import "web_app_specifics.proto";
+import "components/sync/protocol/web_app_specifics.proto";
 
 option optimize_for = LITE_RUNTIME;
 

components/send_tab_to_self/proto/BUILD.gn

@@ -5,7 +5,7 @@
 import("//third_party/protobuf/proto_library.gni")
 
 proto_library("send_tab_to_self_proto") {
-  import_dirs = [ "//components/sync/protocol" ]
+  proto_in_dir = "//"
   sources = [ "send_tab_to_self.proto" ]
   link_deps = [ "//components/sync/protocol:protocol" ]
 }

components/send_tab_to_self/proto/send_tab_to_self.proto

@@ -6,7 +6,7 @@
 
 syntax = "proto2";
 
-import "send_tab_to_self_specifics.proto";
+import "components/sync/protocol/send_tab_to_self_specifics.proto";
 
 option optimize_for = LITE_RUNTIME;
 

components/sync/protocol/BUILD.gn

@@ -7,6 +7,7 @@ import("//third_party/protobuf/proto_library.gni")
 import("protocol_sources.gni")
 
 proto_library("protocol") {
+  proto_in_dir = "//"
   sources = sync_protocol_sources
   extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
 }
@@ -36,7 +37,7 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 
   proto_java_library("protocol_java") {
-    proto_path = "//components/sync/protocol/"
+    proto_path = "//"
     sources = sync_protocol_sources
   }
 }

components/sync/protocol/app_setting_specifics.proto

@@ -18,7 +18,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "extension_setting_specifics.proto";
+import "components/sync/protocol/extension_setting_specifics.proto";
 
 // Properties of app setting sync objects; just an extension setting.
 message AppSettingSpecifics {

components/sync/protocol/app_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "extension_specifics.proto";
+import "components/sync/protocol/extension_specifics.proto";
 
 // Settings related to push notifications for apps.
 message AppNotificationSettings {

components/sync/protocol/bookmark_model_metadata.proto

@@ -11,8 +11,8 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "model_type_state.proto";
-import "entity_metadata.proto";
+import "components/sync/protocol/model_type_state.proto";
+import "components/sync/protocol/entity_metadata.proto";
 
 // Corresponds to a single bookmark id/metadata pair.
 message BookmarkMetadata {

components/sync/protocol/client_debug_info.proto

@@ -16,8 +16,8 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "get_updates_caller_info.proto";
-import "sync_enums.proto";
+import "components/sync/protocol/get_updates_caller_info.proto";
+import "components/sync/protocol/sync_enums.proto";
 
 // Per-type hint information.
 message TypeHint {

components/sync/protocol/device_info_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "sync_enums.proto";
+import "components/sync/protocol/sync_enums.proto";
 
 // Information about a device that is running a sync-enabled Chrome browser.  We
 // are mapping the per-client cache guid to more specific information about the

components/sync/protocol/entity_metadata.proto

@@ -14,7 +14,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "unique_position.proto";
+import "components/sync/protocol/unique_position.proto";
 
 // Sync proto to store entity metadata in model type storage.
 message EntityMetadata {

components/sync/protocol/experiment_status.proto

@@ -15,7 +15,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "experiments_specifics.proto";
+import "components/sync/protocol/experiments_specifics.proto";
 
 // This request allows an unauthenticated client to check the status of the
 // experiments which do not require user authentication.  The status of an

components/sync/protocol/loopback_server.proto

@@ -13,7 +13,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "sync.proto";
+import "components/sync/protocol/sync.proto";
 
 // Serialization of the LoopbackServerEntity and its ancestors.
 message LoopbackServerEntity {

components/sync/protocol/model_type_state.proto

@@ -14,7 +14,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "sync.proto";
+import "components/sync/protocol/sync.proto";
 
 // Sync proto to store data type global metadata in model type storage.
 message ModelTypeState {

components/sync/protocol/nigori_local_data.proto

@@ -14,10 +14,10 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "encryption.proto";
-import "entity_metadata.proto";
-import "model_type_state.proto";
-import "nigori_specifics.proto";
+import "components/sync/protocol/encryption.proto";
+import "components/sync/protocol/entity_metadata.proto";
+import "components/sync/protocol/model_type_state.proto";
+import "components/sync/protocol/nigori_specifics.proto";
 
 message CryptographerData {
   // Contains all known Nigori keys.

components/sync/protocol/nigori_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "encryption.proto";
+import "components/sync/protocol/encryption.proto";
 
 message NigoriKey {
   // Note that M78 and before rely on the name being populated, at least for

components/sync/protocol/os_preference_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "preference_specifics.proto";
+import "components/sync/protocol/preference_specifics.proto";
 
 // Properties of a synced Chrome OS system preference. Uses PreferenceSpecifics
 // instead of declaring name and value fields to allow more code sharing in the

components/sync/protocol/os_priority_preference_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "preference_specifics.proto";
+import "components/sync/protocol/preference_specifics.proto";
 
 // Properties of a Chrome OS priority preference. Uses PreferenceSpecifics
 // instead of declaring name and value fields to allow more code sharing

components/sync/protocol/password_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "encryption.proto";
+import "components/sync/protocol/encryption.proto";
 
 // These are the properties that get serialized into the |encrypted| field of
 // PasswordSpecifics. They correspond to fields in autofill::PasswordForm.

components/sync/protocol/persisted_entity_data.proto

@@ -11,7 +11,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "sync.proto";
+import "components/sync/protocol/sync.proto";
 
 // Sync proto to store entity data similar to what directory stores, used to
 // persist data locally and never sent through the wire.

components/sync/protocol/priority_preference_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "preference_specifics.proto";
+import "components/sync/protocol/preference_specifics.proto";
 
 // Properties of a synced priority preference.
 message PriorityPreferenceSpecifics {

components/sync/protocol/security_event_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "gaia_password_reuse.proto";
+import "components/sync/protocol/gaia_password_reuse.proto";
 
 message SecurityEventSpecifics {
   // The specific security event to record.

components/sync/protocol/session_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "sync_enums.proto";
+import "components/sync/protocol/sync_enums.proto";
 
 message SessionSpecifics {
   // Unique id for the client.

components/sync/protocol/sync.proto

@@ -17,52 +17,52 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "app_list_specifics.proto";
-import "app_notification_specifics.proto";
-import "app_setting_specifics.proto";
-import "app_specifics.proto";
-import "arc_package_specifics.proto";
-import "autofill_specifics.proto";
-import "bookmark_specifics.proto";
-import "client_commands.proto";
-import "client_debug_info.proto";
-import "device_info_specifics.proto";
-import "dictionary_specifics.proto";
-import "encryption.proto";
-import "experiments_specifics.proto";
-import "extension_setting_specifics.proto";
-import "extension_specifics.proto";
-import "favicon_image_specifics.proto";
-import "favicon_tracking_specifics.proto";
-import "get_updates_caller_info.proto";
-import "history_delete_directive_specifics.proto";
-import "managed_user_setting_specifics.proto";
-import "managed_user_shared_setting_specifics.proto";
-import "managed_user_specifics.proto";
-import "managed_user_whitelist_specifics.proto";
-import "nigori_specifics.proto";
-import "os_preference_specifics.proto";
-import "os_priority_preference_specifics.proto";
-import "password_specifics.proto";
-import "preference_specifics.proto";
-import "printer_specifics.proto";
-import "priority_preference_specifics.proto";
-import "reading_list_specifics.proto";
-import "search_engine_specifics.proto";
-import "security_event_specifics.proto";
-import "send_tab_to_self_specifics.proto";
-import "session_specifics.proto";
-import "sharing_message_specifics.proto";
-import "sync_enums.proto";
-import "synced_notification_app_info_specifics.proto";
-import "synced_notification_specifics.proto";
-import "theme_specifics.proto";
-import "typed_url_specifics.proto";
-import "unique_position.proto";
-import "user_consent_specifics.proto";
-import "user_event_specifics.proto";
-import "web_app_specifics.proto";
-import "wifi_configuration_specifics.proto";
+import "components/sync/protocol/app_list_specifics.proto";
+import "components/sync/protocol/app_notification_specifics.proto";
+import "components/sync/protocol/app_setting_specifics.proto";
+import "components/sync/protocol/app_specifics.proto";
+import "components/sync/protocol/arc_package_specifics.proto";
+import "components/sync/protocol/autofill_specifics.proto";
+import "components/sync/protocol/bookmark_specifics.proto";
+import "components/sync/protocol/client_commands.proto";
+import "components/sync/protocol/client_debug_info.proto";
+import "components/sync/protocol/device_info_specifics.proto";
+import "components/sync/protocol/dictionary_specifics.proto";
+import "components/sync/protocol/encryption.proto";
+import "components/sync/protocol/experiments_specifics.proto";
+import "components/sync/protocol/extension_setting_specifics.proto";
+import "components/sync/protocol/extension_specifics.proto";
+import "components/sync/protocol/favicon_image_specifics.proto";
+import "components/sync/protocol/favicon_tracking_specifics.proto";
+import "components/sync/protocol/get_updates_caller_info.proto";
+import "components/sync/protocol/history_delete_directive_specifics.proto";
+import "components/sync/protocol/managed_user_setting_specifics.proto";
+import "components/sync/protocol/managed_user_shared_setting_specifics.proto";
+import "components/sync/protocol/managed_user_specifics.proto";
+import "components/sync/protocol/managed_user_whitelist_specifics.proto";
+import "components/sync/protocol/nigori_specifics.proto";
+import "components/sync/protocol/os_preference_specifics.proto";
+import "components/sync/protocol/os_priority_preference_specifics.proto";
+import "components/sync/protocol/password_specifics.proto";
+import "components/sync/protocol/preference_specifics.proto";
+import "components/sync/protocol/printer_specifics.proto";
+import "components/sync/protocol/priority_preference_specifics.proto";
+import "components/sync/protocol/reading_list_specifics.proto";
+import "components/sync/protocol/search_engine_specifics.proto";
+import "components/sync/protocol/security_event_specifics.proto";
+import "components/sync/protocol/send_tab_to_self_specifics.proto";
+import "components/sync/protocol/session_specifics.proto";
+import "components/sync/protocol/sharing_message_specifics.proto";
+import "components/sync/protocol/sync_enums.proto";
+import "components/sync/protocol/synced_notification_app_info_specifics.proto";
+import "components/sync/protocol/synced_notification_specifics.proto";
+import "components/sync/protocol/theme_specifics.proto";
+import "components/sync/protocol/typed_url_specifics.proto";
+import "components/sync/protocol/unique_position.proto";
+import "components/sync/protocol/user_consent_specifics.proto";
+import "components/sync/protocol/user_event_specifics.proto";
+import "components/sync/protocol/web_app_specifics.proto";
+import "components/sync/protocol/wifi_configuration_specifics.proto";
 
 // Used for inspecting how long we spent performing operations in different
 // backends. All times must be in millis.

components/sync/protocol/user_consent_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "user_consent_types.proto";
+import "components/sync/protocol/user_consent_types.proto";
 
 // Next id: 14
 message UserConsentSpecifics {

components/sync/protocol/user_event_specifics.proto

@@ -16,8 +16,8 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "user_consent_types.proto";
-import "gaia_password_reuse.proto";
+import "components/sync/protocol/user_consent_types.proto";
+import "components/sync/protocol/gaia_password_reuse.proto";
 
 message UserEventSpecifics {
   // Time of event, as measured by client in microseconds since Windows epoch.

components/sync/protocol/wifi_configuration_specifics.proto

@@ -16,7 +16,7 @@ option optimize_for = LITE_RUNTIME;
 
 package sync_pb;
 
-import "encryption.proto";
+import "components/sync/protocol/encryption.proto";
 
 message WifiConfigurationSpecificsData {
   // SSID encoded to hex, letters should be upper case and 0x prefix should be