diff options
56 files changed, 82 insertions, 74 deletions
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 059cba6..94017b7 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -41,9 +41,9 @@ source_set("chromeos") { # TODO(tbarzic): Cleanup this list. ":attestation_proto", ":device_policy_proto", - ":drive_proto", "//ash", "//ash:ash_with_content", + "//components/drive", "//components/login", "//components/session_manager/core", "//components/user_manager", @@ -174,8 +174,8 @@ source_set("unit_tests") { deps = [ ":attestation_proto", ":device_policy_proto", - ":drive_proto", "//ash/resources", + "//components/drive", "//components/policy", "//components/invalidation/public", "//crypto:platform", @@ -190,12 +190,6 @@ source_set("unit_tests") { ] } -proto_library("drive_proto") { - sources = [ - "drive/drive.proto", - ] -} - proto_library("device_policy_proto") { sources = [ "policy/proto/chrome_device_policy.proto", diff --git a/chrome/browser/chromeos/drive/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc index 342efee..e0ab157 100644 --- a/chrome/browser/chromeos/drive/change_list_processor.cc +++ b/chrome/browser/chromeos/drive/change_list_processor.cc @@ -7,11 +7,11 @@ #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/cancellation_flag.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc index 48231d7..1b2bf3b 100644 --- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc @@ -8,13 +8,13 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/download_handler.cc b/chrome/browser/chromeos/drive/download_handler.cc index 108aa80..66e5ad1 100644 --- a/chrome/browser/chromeos/drive/download_handler.cc +++ b/chrome/browser/chromeos/drive/download_handler.cc @@ -8,7 +8,6 @@ #include "base/files/file_util.h" #include "base/supports_user_data.h" #include "base/threading/sequenced_worker_pool.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/file_system_util.h" @@ -16,6 +15,7 @@ #include "chrome/browser/download/download_history.h" #include "chrome/browser/download/download_service.h" #include "chrome/browser/download/download_service_factory.h" +#include "components/drive/drive.pb.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc index 97ce158..6335da5 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc @@ -10,9 +10,9 @@ #include "base/callback_helpers.h" #include "base/logging.h" #include "base/sequenced_task_runner.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/local_file_reader.h" +#include "components/drive/drive.pb.h" #include "content/public/browser/browser_thread.h" #include "google_apis/drive/task_util.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/chromeos/drive/drive_test_util.cc b/chrome/browser/chromeos/drive/drive_test_util.cc index ede6cdc..350413610 100644 --- a/chrome/browser/chromeos/drive/drive_test_util.cc +++ b/chrome/browser/chromeos/drive/drive_test_util.cc @@ -6,8 +6,8 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_service.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_pref_names.h" +#include "components/drive/drive.pb.h" namespace drive { namespace test_util { diff --git a/chrome/browser/chromeos/drive/fake_file_system.cc b/chrome/browser/chromeos/drive/fake_file_system.cc index 58c90f3..de2c0ee 100644 --- a/chrome/browser/chromeos/drive/fake_file_system.cc +++ b/chrome/browser/chromeos/drive/fake_file_system.cc @@ -10,10 +10,10 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" +#include "components/drive/drive.pb.h" #include "components/drive/service/drive_service_interface.h" #include "content/public/browser/browser_thread.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/chromeos/drive/file_cache.cc b/chrome/browser/chromeos/drive/file_cache.cc index b4bb205..9ffd827 100644 --- a/chrome/browser/chromeos/drive/file_cache.cc +++ b/chrome/browser/chromeos/drive/file_cache.cc @@ -17,10 +17,10 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata_storage.h" #include "chromeos/chromeos_constants.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "google_apis/drive/task_util.h" #include "net/base/filename_util.h" diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc index a5ae9cf..e601cfac 100644 --- a/chrome/browser/chromeos/drive/file_cache_unittest.cc +++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc @@ -15,11 +15,11 @@ #include "base/path_service.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata_storage.h" +#include "components/drive/drive.pb.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_change.cc b/chrome/browser/chromeos/drive/file_change.cc index 2e21fd7..81d5985 100644 --- a/chrome/browser/chromeos/drive/file_change.cc +++ b/chrome/browser/chromeos/drive/file_change.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" +#include "components/drive/drive.pb.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc index ec4c27d..fda0a69 100644 --- a/chrome/browser/chromeos/drive/file_system.cc +++ b/chrome/browser/chromeos/drive/file_system.cc @@ -9,7 +9,6 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" #include "chrome/browser/chromeos/drive/directory_loader.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_pref_names.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" @@ -32,6 +31,7 @@ #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/search_metadata.h" #include "chrome/browser/chromeos/drive/sync_client.h" +#include "components/drive/drive.pb.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc index 0ab562c..606186e 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc @@ -7,7 +7,6 @@ #include <string> #include "base/task_runner_util.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h" @@ -16,6 +15,7 @@ #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc b/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc index f06e660..ca05681 100644 --- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc @@ -4,12 +4,12 @@ #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" namespace drive { namespace file_system { diff --git a/chrome/browser/chromeos/drive/file_system/create_file_operation.cc b/chrome/browser/chromeos/drive/file_system/create_file_operation.cc index 5091c52..cc2450d 100644 --- a/chrome/browser/chromeos/drive/file_system/create_file_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/create_file_operation.cc @@ -7,11 +7,11 @@ #include <string> #include "base/files/file_util.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "net/base/mime_util.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/download_operation.cc b/chrome/browser/chromeos/drive/file_system/download_operation.cc index 2032a49..b917f7b 100644 --- a/chrome/browser/chromeos/drive/file_system/download_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/download_operation.cc @@ -9,7 +9,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/task_runner_util.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_errors.h" @@ -17,6 +16,7 @@ #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "google_apis/drive/drive_api_error_codes.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc index 6c0bc18..1fe43bd 100644 --- a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc @@ -9,12 +9,12 @@ #include "base/files/file_util.h" #include "base/run_loop.h" #include "base/task_runner_util.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/chromeos/drive/file_write_watcher.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" +#include "components/drive/drive.pb.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.cc b/chrome/browser/chromeos/drive/file_system/move_operation.cc index f48526d..5f2dd91 100644 --- a/chrome/browser/chromeos/drive/file_system/move_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/move_operation.cc @@ -5,11 +5,11 @@ #include "chrome/browser/chromeos/drive/file_system/move_operation.h" #include "base/sequenced_task_runner.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" namespace drive { namespace file_system { diff --git a/chrome/browser/chromeos/drive/file_system/open_file_operation.cc b/chrome/browser/chromeos/drive/file_system/open_file_operation.cc index ee779ec..dde595c 100644 --- a/chrome/browser/chromeos/drive/file_system/open_file_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/open_file_operation.cc @@ -11,13 +11,13 @@ #include "base/logging.h" #include "base/task_runner_util.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h" #include "chrome/browser/chromeos/drive/file_system/download_operation.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" +#include "components/drive/drive.pb.h" namespace drive { namespace file_system { diff --git a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc index d872c1a..1126984 100644 --- a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc @@ -10,11 +10,11 @@ #include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/task_runner_util.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" +#include "components/drive/drive.pb.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h index b65257e..57eb401 100644 --- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h +++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h @@ -8,11 +8,11 @@ #include <set> #include "base/files/scoped_temp_dir.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" +#include "components/drive/drive.pb.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.cc b/chrome/browser/chromeos/drive/file_system/remove_operation.cc index 73047ae..584eaa5 100644 --- a/chrome/browser/chromeos/drive/file_system/remove_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/remove_operation.cc @@ -5,13 +5,13 @@ #include "chrome/browser/chromeos/drive/file_system/remove_operation.h" #include "base/sequenced_task_runner.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" namespace drive { namespace file_system { diff --git a/chrome/browser/chromeos/drive/file_system/set_property_operation.cc b/chrome/browser/chromeos/drive/file_system/set_property_operation.cc index 509ba2a..48ebd75 100644 --- a/chrome/browser/chromeos/drive/file_system/set_property_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/set_property_operation.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/sequenced_task_runner.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" namespace drive { namespace file_system { diff --git a/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc index 99e4e79..396245b 100644 --- a/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc @@ -5,9 +5,9 @@ #include "chrome/browser/chromeos/drive/file_system/set_property_operation.h" #include "base/files/file_path.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" +#include "components/drive/drive.pb.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/drive_api_requests.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc index 7c64bd8..869eb5d 100644 --- a/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc @@ -6,10 +6,10 @@ #include "base/files/file_path.h" #include "base/time/time.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_system/truncate_operation.cc b/chrome/browser/chromeos/drive/file_system/truncate_operation.cc index ff1307e..f94fe52 100644 --- a/chrome/browser/chromeos/drive/file_system/truncate_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/truncate_operation.cc @@ -12,12 +12,12 @@ #include "base/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/download_operation.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" +#include "components/drive/drive.pb.h" namespace drive { namespace file_system { diff --git a/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc index 9b111ea..77973a1 100644 --- a/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc @@ -7,9 +7,9 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/task_runner_util.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" +#include "components/drive/drive.pb.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_system_core_util.cc b/chrome/browser/chromeos/drive/file_system_core_util.cc index 0e035a8..a82b329 100644 --- a/chrome/browser/chromeos/drive/file_system_core_util.cc +++ b/chrome/browser/chromeos/drive/file_system_core_util.cc @@ -22,11 +22,11 @@ #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_pref_names.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/job_list.h" #include "chrome/browser/chromeos/drive/write_on_cache_file.h" +#include "components/drive/drive.pb.h" #include "net/base/escape.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system_interface.h b/chrome/browser/chromeos/drive/file_system_interface.h index ebe6323..c7f712d 100644 --- a/chrome/browser/chromeos/drive/file_system_interface.h +++ b/chrome/browser/chromeos/drive/file_system_interface.h @@ -9,9 +9,9 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_metadata.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "google_apis/drive/base_requests.h" #include "google_apis/drive/drive_api_requests.h" diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc index 4e95338..e2fa228 100644 --- a/chrome/browser/chromeos/drive/file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_unittest.cc @@ -17,7 +17,6 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_change.h" @@ -25,6 +24,7 @@ #include "chrome/browser/chromeos/drive/file_system_observer.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/sync_client.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "components/drive/event_logger.h" #include "components/drive/service/fake_drive_service.h" diff --git a/chrome/browser/chromeos/drive/file_system_util.cc b/chrome/browser/chromeos/drive/file_system_util.cc index 80f20c2..406af7f 100644 --- a/chrome/browser/chromeos/drive/file_system_util.cc +++ b/chrome/browser/chromeos/drive/file_system_util.cc @@ -23,7 +23,6 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/drive_pref_names.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" @@ -37,6 +36,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths_internal.h" #include "chromeos/chromeos_constants.h" +#include "components/drive/drive.pb.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/browser_thread.h" #include "storage/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc index 84d3dbf..ae60295 100644 --- a/chrome/browser/chromeos/drive/file_task_executor.cc +++ b/chrome/browser/chromeos/drive/file_task_executor.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/file_system_util.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/common/extensions/api/file_manager_private.h" +#include "components/drive/drive.pb.h" #include "components/drive/service/drive_service_interface.h" #include "content/public/browser/browser_thread.h" #include "storage/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc index 9d1a5fc..ee90d2b 100644 --- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc +++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc @@ -9,11 +9,11 @@ #include "base/task_runner_util.h" #include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" +#include "components/drive/drive.pb.h" #include "content/public/browser/browser_thread.h" #include "storage/browser/fileapi/file_system_url.h" #include "storage/common/fileapi/directory_entry.h" diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc index 87a8cc7..8ff9504 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc @@ -8,8 +8,8 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/logging.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h" +#include "components/drive/drive.pb.h" #include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/chromeos/drive/remove_stale_cache_files.cc b/chrome/browser/chromeos/drive/remove_stale_cache_files.cc index 533e9fb..be931c48 100644 --- a/chrome/browser/chromeos/drive/remove_stale_cache_files.cc +++ b/chrome/browser/chromeos/drive/remove_stale_cache_files.cc @@ -5,9 +5,9 @@ #include "chrome/browser/chromeos/drive/remove_stale_cache_files.h" #include "base/logging.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" namespace drive { namespace internal { diff --git a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc index 415a53b..580ddcc 100644 --- a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc +++ b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc @@ -10,12 +10,12 @@ #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/remove_stale_cache_files.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion.cc b/chrome/browser/chromeos/drive/resource_entry_conversion.cc index ba23fbe0..4ea89e3 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/time/time.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc index 78b357d..db6b22d 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "base/time/time.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/resource_metadata.cc b/chrome/browser/chromeos/drive/resource_metadata.cc index d07c34f..1842fe5 100644 --- a/chrome/browser/chromeos/drive/resource_metadata.cc +++ b/chrome/browser/chromeos/drive/resource_metadata.cc @@ -12,10 +12,10 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata_storage.h" +#include "components/drive/drive.pb.h" namespace drive { namespace internal { diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage.cc b/chrome/browser/chromeos/drive/resource_metadata_storage.cc index 3b43091..d64adee 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_storage.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_storage.cc @@ -16,7 +16,7 @@ #include "base/metrics/sparse_histogram.h" #include "base/sequenced_task_runner.h" #include "base/threading/thread_restrictions.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "third_party/leveldatabase/env_chromium.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage.h b/chrome/browser/chromeos/drive/resource_metadata_storage.h index d2b7a18..7b717f3 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_storage.h +++ b/chrome/browser/chromeos/drive/resource_metadata_storage.h @@ -12,8 +12,8 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_errors.h" +#include "components/drive/drive.pb.h" namespace base { class SequencedTaskRunner; diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc index fecc616..ebad576 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc @@ -11,8 +11,8 @@ #include "base/single_thread_task_runner.h" #include "base/strings/string_split.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" +#include "components/drive/drive.pb.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc index 09e3353..5a0f553 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc @@ -12,11 +12,11 @@ #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" +#include "components/drive/drive.pb.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc index 4506929..23b458a 100644 --- a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc +++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc @@ -5,12 +5,12 @@ #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h" #include "chrome/browser/chromeos/drive/change_list_processor.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc index 32edf8a..ad0e099 100644 --- a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc +++ b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc @@ -9,7 +9,6 @@ #include "base/callback_helpers.h" #include "base/files/file_util.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" @@ -18,6 +17,7 @@ #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h" #include "chrome/browser/chromeos/drive/sync/remove_performer.h" +#include "components/drive/drive.pb.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/sync/remove_performer.cc b/chrome/browser/chromeos/drive/sync/remove_performer.cc index 57b089c..4bcdf59 100644 --- a/chrome/browser/chromeos/drive/sync/remove_performer.cc +++ b/chrome/browser/chromeos/drive/sync/remove_performer.cc @@ -5,13 +5,13 @@ #include "chrome/browser/chromeos/drive/sync/remove_performer.h" #include "base/sequenced_task_runner.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/chromeos/drive/sync_client.cc b/chrome/browser/chromeos/drive/sync_client.cc index d106c29..1b9c6d2 100644 --- a/chrome/browser/chromeos/drive/sync_client.cc +++ b/chrome/browser/chromeos/drive/sync_client.cc @@ -8,13 +8,13 @@ #include "base/bind.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system/download_operation.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/sync/entry_update_performer.h" +#include "components/drive/drive.pb.h" #include "google_apis/drive/task_util.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc index b911572..d66418f 100644 --- a/chrome/browser/chromeos/drive/sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc @@ -14,7 +14,6 @@ #include "base/test/test_timeouts.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" @@ -26,6 +25,7 @@ #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" +#include "components/drive/drive.pb.h" #include "components/drive/event_logger.h" #include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc index fd300ab..f5dff8a 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc @@ -16,7 +16,6 @@ #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/extensions/file_manager/event_router.h" @@ -33,6 +32,7 @@ #include "chrome/common/extensions/api/file_manager_private.h" #include "chrome/common/extensions/api/file_manager_private_internal.h" #include "chromeos/disks/disk_mount_manager.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "components/drive/event_logger.h" #include "components/storage_monitor/storage_info.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h index f1dd7da..a307d25 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h @@ -10,9 +10,9 @@ #include <vector> #include "base/files/file_path.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h" +#include "components/drive/drive.pb.h" namespace ui { struct SelectedFileInfo; diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc index 81a89f9..79bb4b5 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc @@ -8,7 +8,6 @@ #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" @@ -22,6 +21,7 @@ #include "chrome/browser/chromeos/fileapi/file_system_backend.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/file_manager_private.h" +#include "components/drive/drive.pb.h" #include "content/public/browser/child_process_security_policy.h" #include "storage/browser/fileapi/file_system_context.h" #include "storage/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/extensions/api/api_registration.gyp b/chrome/browser/extensions/api/api_registration.gyp index 458126f..0dc611f 100644 --- a/chrome/browser/extensions/api/api_registration.gyp +++ b/chrome/browser/extensions/api/api_registration.gyp @@ -32,7 +32,7 @@ 'conditions': [ ['chromeos==1', { 'dependencies': [ - '<(DEPTH)/chrome/chrome.gyp:drive_proto', + '<(DEPTH)/components/components.gyp:drive_proto', ], }], ], diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc index 7682d73..e796aab 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc @@ -15,7 +15,6 @@ #include "base/strings/stringprintf.h" #include "base/sys_info.h" #include "chrome/browser/chromeos/drive/debug_info_collector.h" -#include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/drive_pref_names.h" #include "chrome/browser/chromeos/drive/file_system_util.h" @@ -25,6 +24,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/drive/drive.pb.h" #include "components/drive/drive_api_util.h" #include "components/drive/drive_notification_manager.h" #include "components/drive/event_logger.h" diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 3c0fc0e..57cdc44 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -1141,7 +1141,6 @@ 'common_net', 'debugger', 'device_policy_proto', - 'drive_proto', 'encrypted_cert_logger_proto', 'installer_util', 'safe_browsing_chunk_proto', @@ -1157,6 +1156,7 @@ '../chromeos/chromeos.gyp:power_manager_proto', '../chromeos/ime/input_method.gyp:gencode', '../components/components.gyp:cloud_policy_proto', + '../components/components.gyp:drive', '../components/components.gyp:login', '../components/components.gyp:onc_component', '../components/components.gyp:ownership', @@ -1308,18 +1308,6 @@ ], }, { - # GN version: //chrome/browser/chromeos:drive_proto - # Protobuf compiler / generator for the Drive protocol buffer. - 'target_name': 'drive_proto', - 'type': 'static_library', - 'sources': [ 'browser/chromeos/drive/drive.proto' ], - 'variables': { - 'proto_in_dir': 'browser/chromeos/drive', - 'proto_out_dir': 'chrome/browser/chromeos/drive', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - { # GN version: //chrome/browser/chromeos:device_policy_proto # Protobuf compiler / generator for device settings protocol buffers. 'target_name': 'device_policy_proto', diff --git a/components/drive.gypi b/components/drive.gypi index d01f420..730636c 100644 --- a/components/drive.gypi +++ b/components/drive.gypi @@ -12,6 +12,7 @@ '..', ], 'dependencies': [ + 'drive_proto', '../base/base.gyp:base', '../components/components.gyp:invalidation_public', @@ -49,6 +50,19 @@ }, { + # GN version: //components/drive:proto + # Protobuf compiler / generator for the Drive protocol buffer. + 'target_name': 'drive_proto', + 'type': 'static_library', + 'sources': [ 'drive/drive.proto' ], + 'variables': { + 'proto_in_dir': 'drive', + 'proto_out_dir': 'components/drive', + }, + 'includes': [ '../build/protoc.gypi' ] + }, + + { # GN version: //components/drive:test_support 'target_name': 'drive_test_support', 'type': 'static_library', diff --git a/components/drive/BUILD.gn b/components/drive/BUILD.gn index 64f3141..f3f91c4 100644 --- a/components/drive/BUILD.gn +++ b/components/drive/BUILD.gn @@ -2,6 +2,8 @@ # 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") + source_set("drive") { sources = [ "drive_api_util.cc", @@ -36,6 +38,16 @@ source_set("drive") { "//third_party/re2:re2", ] + public_deps = [ + ":proto", + ] +} + +proto_library("proto") { + visibility = [ ":drive" ] + sources = [ + "drive.proto", + ] } source_set("test_support") { diff --git a/chrome/browser/chromeos/drive/drive.proto b/components/drive/drive.proto index 6c99781..7a99598 100644 --- a/chrome/browser/chromeos/drive/drive.proto +++ b/components/drive/drive.proto @@ -125,8 +125,8 @@ message ResourceEntry { // Used to remember whether this entry is edited locally or not. enum EditState { - CLEAN = 0; // No local edit. - DIRTY = 1; // Edited locally. + CLEAN = 0; // No local edit. + DIRTY = 1; // Edited locally. SYNCING = 2; // Local change is being synced to the server. } |