diff options
193 files changed, 427 insertions, 430 deletions
diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service.cc index 35e0cde..48ac54dd 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service.cc +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service.cc @@ -21,11 +21,11 @@ #include "base/timer/timer.h" #include "base/values.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" -#include "chrome/browser/google_apis/gdata_contacts_requests.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/request_sender.h" -#include "chrome/browser/google_apis/time_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/gdata_contacts_requests.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/request_sender.h" +#include "google_apis/drive/time_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_stub.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_stub.cc index bc29536..a14e5c0 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service_stub.cc +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_stub.cc @@ -8,8 +8,8 @@ #include "chrome/browser/chromeos/contacts/contact.pb.h" #include "chrome/browser/chromeos/contacts/contact_test_util.h" -#include "chrome/browser/google_apis/time_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/time_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc index ea4546c..c16704e 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc @@ -11,14 +11,14 @@ #include "base/time/time.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" #include "chrome/browser/chromeos/contacts/contact_test_util.h" -#include "chrome/browser/google_apis/dummy_auth_service.h" -#include "chrome/browser/google_apis/test_util.h" -#include "chrome/browser/google_apis/time_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_utils.h" +#include "google_apis/drive/dummy_auth_service.h" +#include "google_apis/drive/test_util.h" +#include "google_apis/drive/time_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/chrome/browser/chromeos/contacts/google_contact_store.cc b/chrome/browser/chromeos/contacts/google_contact_store.cc index 73a6752..508503b 100644 --- a/chrome/browser/chromeos/contacts/google_contact_store.cc +++ b/chrome/browser/chromeos/contacts/google_contact_store.cc @@ -15,12 +15,12 @@ #include "chrome/browser/chromeos/contacts/contact_store_observer.h" #include "chrome/browser/chromeos/contacts/gdata_contacts_service.h" #include "chrome/browser/chromeos/profiles/profile_util.h" -#include "chrome/browser/google_apis/auth_service.h" -#include "chrome/browser/google_apis/time_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/auth_service.h" +#include "google_apis/drive/time_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/contacts/google_contact_store_unittest.cc b/chrome/browser/chromeos/contacts/google_contact_store_unittest.cc index bae3b1b..e376fda 100644 --- a/chrome/browser/chromeos/contacts/google_contact_store_unittest.cc +++ b/chrome/browser/chromeos/contacts/google_contact_store_unittest.cc @@ -13,10 +13,10 @@ #include "chrome/browser/chromeos/contacts/contact_test_util.h" #include "chrome/browser/chromeos/contacts/fake_contact_database.h" #include "chrome/browser/chromeos/contacts/gdata_contacts_service_stub.h" -#include "chrome/browser/google_apis/time_util.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/drive/time_util.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/async_file_util.cc b/chrome/browser/chromeos/drive/async_file_util.cc index 4e9a03a..1626809 100644 --- a/chrome/browser/chromeos/drive/async_file_util.cc +++ b/chrome/browser/chromeos/drive/async_file_util.cc @@ -11,8 +11,8 @@ #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/fileapi_worker.h" -#include "chrome/browser/google_apis/task_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/task_util.h" #include "webkit/browser/fileapi/file_system_operation_context.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/common/blob/shareable_file_reference.h" diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc index cfdb98e..d2372cb 100644 --- a/chrome/browser/chromeos/drive/change_list_loader.cc +++ b/chrome/browser/chromeos/drive/change_list_loader.cc @@ -18,8 +18,8 @@ #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/drive_api_parser.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/change_list_loader.h b/chrome/browser/chromeos/drive/change_list_loader.h index 32141d0..f352d6c 100644 --- a/chrome/browser/chromeos/drive/change_list_loader.h +++ b/chrome/browser/chromeos/drive/change_list_loader.h @@ -17,7 +17,7 @@ #include "base/observer_list.h" #include "base/time/time.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" class GURL; diff --git a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc index 5ed52c3..d071f70 100644 --- a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc @@ -16,8 +16,8 @@ #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc index ab4fef6..dd7e5c1 100644 --- a/chrome/browser/chromeos/drive/change_list_processor.cc +++ b/chrome/browser/chromeos/drive/change_list_processor.cc @@ -10,8 +10,8 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" namespace drive { namespace internal { diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc index 9edccdb..111c5ee 100644 --- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc @@ -11,10 +11,10 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/chromeos/drive/test_util.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/debug_info_collector.cc b/chrome/browser/chromeos/drive/debug_info_collector.cc index f75b6ea..8dc3c25 100644 --- a/chrome/browser/chromeos/drive/debug_info_collector.cc +++ b/chrome/browser/chromeos/drive/debug_info_collector.cc @@ -6,8 +6,8 @@ #include "base/callback.h" #include "base/logging.h" -#include "chrome/browser/google_apis/task_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/task_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/drive_app_registry.cc b/chrome/browser/chromeos/drive/drive_app_registry.cc index 49f78fa..629a2d9 100644 --- a/chrome/browser/chromeos/drive/drive_app_registry.cc +++ b/chrome/browser/chromeos/drive/drive_app_registry.cc @@ -13,8 +13,8 @@ #include "base/strings/string_util.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/drive_api_parser.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/drive_app_registry.h b/chrome/browser/chromeos/drive/drive_app_registry.h index c9a4b2d..cd84904 100644 --- a/chrome/browser/chromeos/drive/drive_app_registry.h +++ b/chrome/browser/chromeos/drive/drive_app_registry.h @@ -13,8 +13,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "url/gurl.h" namespace google_apis { diff --git a/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc b/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc index 072c305..5bb44ca 100644 --- a/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc @@ -10,10 +10,10 @@ #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc index 88e815d..8f4776b 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc @@ -13,8 +13,8 @@ #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 "chrome/browser/google_apis/task_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/task_util.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/http/http_byte_range.h" diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.h b/chrome/browser/chromeos/drive/drive_file_stream_reader.h index 2ef0d65..7e465b7 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader.h +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" #include "net/base/completion_callback.h" namespace base { diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc index 5ec3a87..8b0bfc5 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc @@ -16,8 +16,8 @@ #include "chrome/browser/chromeos/drive/local_file_reader.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc index 8496969..4044de2 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service.cc @@ -30,8 +30,6 @@ #include "chrome/browser/drive/drive_notification_manager.h" #include "chrome/browser/drive/drive_notification_manager_factory.h" #include "chrome/browser/drive/gdata_wapi_service.h" -#include "chrome/browser/google_apis/auth_service.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -40,6 +38,8 @@ #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/auth_service.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "webkit/browser/fileapi/external_mount_points.h" diff --git a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc index fa02bc46..0eb383a 100644 --- a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc @@ -16,10 +16,10 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "net/base/request_priority.h" #include "net/base/test_completion_callback.h" #include "net/http/http_byte_range.h" diff --git a/chrome/browser/chromeos/drive/fake_file_system.cc b/chrome/browser/chromeos/drive/fake_file_system.cc index b85dcd7..5201a07 100644 --- a/chrome/browser/chromeos/drive/fake_file_system.cc +++ b/chrome/browser/chromeos/drive/fake_file_system.cc @@ -15,9 +15,9 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/fake_file_system.h b/chrome/browser/chromeos/drive/fake_file_system.h index 21ec849..84e4d08 100644 --- a/chrome/browser/chromeos/drive/fake_file_system.h +++ b/chrome/browser/chromeos/drive/fake_file_system.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace google_apis { diff --git a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc index 9d6be63..6b014ab 100644 --- a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc @@ -8,8 +8,8 @@ #include "base/run_loop.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc index 5d3e8b8..d604f0d 100644 --- a/chrome/browser/chromeos/drive/file_cache_unittest.cc +++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc @@ -19,9 +19,9 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/resource_metadata_storage.h" #include "chrome/browser/chromeos/drive/test_util.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_errors.h b/chrome/browser/chromeos/drive/file_errors.h index 4b7bc671..87d7f67 100644 --- a/chrome/browser/chromeos/drive/file_errors.h +++ b/chrome/browser/chromeos/drive/file_errors.h @@ -7,7 +7,7 @@ #include "base/callback_forward.h" #include "base/platform_file.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc index f273040..6948e24 100644 --- a/chrome/browser/chromeos/drive/file_system.cc +++ b/chrome/browser/chromeos/drive/file_system.cc @@ -34,9 +34,9 @@ #include "chrome/browser/chromeos/drive/search_metadata.h" #include "chrome/browser/chromeos/drive/sync_client.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/drive_api_parser.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/file_system.h b/chrome/browser/chromeos/drive/file_system.h index e0c2958..0f47b69 100644 --- a/chrome/browser/chromeos/drive/file_system.h +++ b/chrome/browser/chromeos/drive/file_system.h @@ -14,7 +14,7 @@ #include "chrome/browser/chromeos/drive/change_list_loader_observer.h" #include "chrome/browser/chromeos/drive/file_system/operation_observer.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" class PrefService; diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.h b/chrome/browser/chromeos/drive/file_system/copy_operation.h index a55953c..3923de4 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation.h +++ b/chrome/browser/chromeos/drive/file_system/copy_operation.h @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class FilePath; diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc index 1c43ac9..8340ac3 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { 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 f11c8429..e60a695 100644 --- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc @@ -9,9 +9,9 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/gdata_wapi_parser.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h index 3f72a27..9867327 100644 --- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h +++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class FilePath; diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc index e79692b..5152f31 100644 --- a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h" #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/create_file_operation.h b/chrome/browser/chromeos/drive/file_system/create_file_operation.h index 6d9e193..e9e3ce4 100644 --- a/chrome/browser/chromeos/drive/file_system/create_file_operation.h +++ b/chrome/browser/chromeos/drive/file_system/create_file_operation.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class FilePath; diff --git a/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc index 3ec2c43..05e51a9 100644 --- a/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h" #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.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 b7ed758..cc00daa 100644 --- a/chrome/browser/chromeos/drive/file_system/download_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/download_operation.cc @@ -16,8 +16,8 @@ #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/google_apis/gdata_errorcode.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/gdata_errorcode.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/file_system/download_operation.h b/chrome/browser/chromeos/drive/file_system/download_operation.h index e81a3f2..5290409 100644 --- a/chrome/browser/chromeos/drive/file_system/download_operation.h +++ b/chrome/browser/chromeos/drive/file_system/download_operation.h @@ -10,7 +10,7 @@ #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/job_list.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class FilePath; diff --git a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc index e9f8a29..0eedc78 100644 --- a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.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 4efa89b..814e767 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 @@ -13,7 +13,7 @@ #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/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.h b/chrome/browser/chromeos/drive/file_system/move_operation.h index f71d552..019c268 100644 --- a/chrome/browser/chromeos/drive/file_system/move_operation.h +++ b/chrome/browser/chromeos/drive/file_system/move_operation.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class FilePath; diff --git a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc index b153350..956dc04 100644 --- a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/chromeos/drive/file_system/copy_operation.h" #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { 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 8bfdeb4..5a1becf 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 @@ -13,7 +13,7 @@ #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/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc index 6f90ef5..54fd809 100644 --- a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc +++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc @@ -14,8 +14,8 @@ #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/test_util.h" namespace drive { namespace file_system { diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.h b/chrome/browser/chromeos/drive/file_system/remove_operation.h index 97f727b..a7d961a 100644 --- a/chrome/browser/chromeos/drive/file_system/remove_operation.h +++ b/chrome/browser/chromeos/drive/file_system/remove_operation.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class FilePath; diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc index 5911e0a..f55c6a3 100644 --- a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc @@ -6,7 +6,7 @@ #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/chromeos/drive/file_system_util.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/search_operation.cc b/chrome/browser/chromeos/drive/file_system/search_operation.cc index 2175e45..d1663f8 100644 --- a/chrome/browser/chromeos/drive/file_system/search_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/search_operation.cc @@ -15,8 +15,8 @@ #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/google_apis/gdata_wapi_parser.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/file_system/search_operation.h b/chrome/browser/chromeos/drive/file_system/search_operation.h index f0e20c7..78a21e2 100644 --- a/chrome/browser/chromeos/drive/file_system/search_operation.h +++ b/chrome/browser/chromeos/drive/file_system/search_operation.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class SequencedTaskRunner; diff --git a/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc index 603f214..730f920 100644 --- a/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/touch_operation.h b/chrome/browser/chromeos/drive/file_system/touch_operation.h index ff73de9..9b0c99b 100644 --- a/chrome/browser/chromeos/drive/file_system/touch_operation.h +++ b/chrome/browser/chromeos/drive/file_system/touch_operation.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class FilePath; 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 7b684b9..3917802 100644 --- a/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc @@ -10,7 +10,7 @@ #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 "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { 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 af46e53..7d48c66 100644 --- a/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc @@ -10,7 +10,7 @@ #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 "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/update_operation.h b/chrome/browser/chromeos/drive/file_system/update_operation.h index 869e526..9557c7d 100644 --- a/chrome/browser/chromeos/drive/file_system/update_operation.h +++ b/chrome/browser/chromeos/drive/file_system/update_operation.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class FilePath; diff --git a/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc index 4964acf..3d398eb 100644 --- a/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc @@ -8,8 +8,8 @@ #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system_interface.h b/chrome/browser/chromeos/drive/file_system_interface.h index 643944a..a5f03cc 100644 --- a/chrome/browser/chromeos/drive/file_system_interface.h +++ b/chrome/browser/chromeos/drive/file_system_interface.h @@ -12,7 +12,7 @@ #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 "chrome/browser/google_apis/base_requests.h" +#include "google_apis/drive/base_requests.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc index 6ff6924..09d5f85 100644 --- a/chrome/browser/chromeos/drive/file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_unittest.cc @@ -25,9 +25,9 @@ #include "chrome/browser/chromeos/drive/sync_client.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/test_util.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" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system_util.cc b/chrome/browser/chromeos/drive/file_system_util.cc index f9b56fa..f22fccb 100644 --- a/chrome/browser/chromeos/drive/file_system_util.cc +++ b/chrome/browser/chromeos/drive/file_system_util.cc @@ -28,7 +28,6 @@ #include "chrome/browser/chromeos/drive/job_list.h" #include "chrome/browser/chromeos/drive/write_on_cache_file.h" #include "chrome/browser/chromeos/profiles/profile_util.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_constants.h" @@ -37,6 +36,7 @@ #include "chrome/common/url_constants.h" #include "chromeos/chromeos_constants.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "net/base/escape.h" #include "webkit/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/chromeos/drive/file_system_util_unittest.cc b/chrome/browser/chromeos/drive/file_system_util_unittest.cc index f615798..a85359a 100644 --- a/chrome/browser/chromeos/drive/file_system_util_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_util_unittest.cc @@ -9,9 +9,9 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/google_apis/test_util.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_file_system_options.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/fileapi/external_mount_points.h" #include "webkit/browser/fileapi/file_system_backend.h" diff --git a/chrome/browser/chromeos/drive/file_task_executor.h b/chrome/browser/chromeos/drive/file_task_executor.h index 6379dea..0bdf6bc 100644 --- a/chrome/browser/chromeos/drive/file_task_executor.h +++ b/chrome/browser/chromeos/drive/file_task_executor.h @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/file_manager/file_tasks.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_write_watcher.cc b/chrome/browser/chromeos/drive/file_write_watcher.cc index 267eda2..8c658d6 100644 --- a/chrome/browser/chromeos/drive/file_write_watcher.cc +++ b/chrome/browser/chromeos/drive/file_write_watcher.cc @@ -13,8 +13,8 @@ #include "base/stl_util.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/drive/logging.h" -#include "chrome/browser/google_apis/task_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/task_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/fileapi_worker_unittest.cc b/chrome/browser/chromeos/drive/fileapi_worker_unittest.cc index 32c51f55..096c7bb 100644 --- a/chrome/browser/chromeos/drive/fileapi_worker_unittest.cc +++ b/chrome/browser/chromeos/drive/fileapi_worker_unittest.cc @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/drive/dummy_file_system.h" #include "chrome/browser/chromeos/drive/test_util.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc index 6a95826..0960661 100644 --- a/chrome/browser/chromeos/drive/job_scheduler.cc +++ b/chrome/browser/chromeos/drive/job_scheduler.cc @@ -11,9 +11,9 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/logging.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/drive_api_parser.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc index 3132ab7..3631761 100644 --- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc +++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc @@ -15,11 +15,11 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" #include "chrome/common/pref_names.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc index 1f9be24..414b437 100644 --- a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc @@ -14,7 +14,7 @@ #include "base/rand_util.h" #include "base/threading/thread.h" #include "chrome/browser/chromeos/drive/test_util.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" #include "testing/gtest/include/gtest/gtest.h" 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 a7be94b..5e0252b 100644 --- a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc +++ b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc @@ -15,8 +15,8 @@ #include "chrome/browser/chromeos/drive/remove_stale_cache_files.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/chromeos/drive/test_util.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion.cc b/chrome/browser/chromeos/drive/resource_entry_conversion.cc index a5f87ad..257abf8 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion.cc @@ -13,7 +13,7 @@ #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc index d3bfab6..bd76db2 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/test_util.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc index ea1a604..00ce26d 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc @@ -15,9 +15,9 @@ #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/test_util.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer.h b/chrome/browser/chromeos/drive/sync/entry_update_performer.h index ccb631e..e140b46 100644 --- a/chrome/browser/chromeos/drive/sync/entry_update_performer.h +++ b/chrome/browser/chromeos/drive/sync/entry_update_performer.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class SequencedTaskRunner; diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc index 768b369..4607b92 100644 --- a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc +++ b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/sync/remove_performer.h b/chrome/browser/chromeos/drive/sync/remove_performer.h index 3fc0fba..c57da1c 100644 --- a/chrome/browser/chromeos/drive/sync/remove_performer.h +++ b/chrome/browser/chromeos/drive/sync/remove_performer.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/drive/file_errors.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class SequencedTaskRunner; diff --git a/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc index ad67500..1de9c8a 100644 --- a/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc +++ b/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" namespace drive { namespace internal { diff --git a/chrome/browser/chromeos/drive/sync_client.cc b/chrome/browser/chromeos/drive/sync_client.cc index 5bde87a..e665f54d 100644 --- a/chrome/browser/chromeos/drive/sync_client.cc +++ b/chrome/browser/chromeos/drive/sync_client.cc @@ -14,8 +14,8 @@ #include "chrome/browser/chromeos/drive/file_system/update_operation.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/sync/entry_update_performer.h" -#include "chrome/browser/google_apis/task_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/task_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc index 1a83029..c58373f 100644 --- a/chrome/browser/chromeos/drive/sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc @@ -25,8 +25,8 @@ #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/test_util.h b/chrome/browser/chromeos/drive/test_util.h index 7b21896..72d2f39 100644 --- a/chrome/browser/chromeos/drive/test_util.h +++ b/chrome/browser/chromeos/drive/test_util.h @@ -8,7 +8,7 @@ #include <string> #include "chrome/browser/chromeos/drive/file_cache.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc index f91f823..ba148af 100644 --- a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc +++ b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc @@ -16,8 +16,8 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/time_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/time_util.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/chrome/browser/chromeos/drive/webkit_file_stream_writer_impl.cc b/chrome/browser/chromeos/drive/webkit_file_stream_writer_impl.cc index f0a04ed..3e9397c 100644 --- a/chrome/browser/chromeos/drive/webkit_file_stream_writer_impl.cc +++ b/chrome/browser/chromeos/drive/webkit_file_stream_writer_impl.cc @@ -8,8 +8,8 @@ #include "base/callback_helpers.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/fileapi_worker.h" -#include "chrome/browser/google_apis/task_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/task_util.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "webkit/browser/fileapi/file_stream_writer.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc index 4b15d77..206f7a2 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc @@ -14,7 +14,6 @@ #include "chrome/browser/chromeos/file_manager/app_installer.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" -#include "chrome/browser/google_apis/auth_service.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" @@ -23,6 +22,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/render_view_host.h" #include "content/public/common/page_zoom.h" +#include "google_apis/drive/auth_service.h" #include "google_apis/gaia/oauth2_token_service.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h index 6d6a371..e447d5c 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h @@ -10,7 +10,7 @@ #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h" #include "chrome/browser/chromeos/file_manager/zip_file_creator.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace google_apis { class AuthServiceInterface; diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_util.h b/chrome/browser/chromeos/extensions/file_manager/private_api_util.h index afd9f95..b8daae6 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_util.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_util.h @@ -8,7 +8,7 @@ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_UTIL_H_ #include "base/callback_forward.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "url/gurl.h" class ExtensionFunctionDispatcher; diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc index 06bba9e..561aba3 100644 --- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc +++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc @@ -11,12 +11,12 @@ #include "chrome/browser/chromeos/file_manager/drive_test_util.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/google_apis/test_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#include "google_apis/drive/test_util.h" #include "webkit/browser/fileapi/external_mount_points.h" // Tests for access to external file systems (as defined in diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index 2722de8..7be96c2 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -30,8 +30,6 @@ #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chromeos/chromeos_switches.h" @@ -39,6 +37,8 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" #include "extensions/common/extension.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "webkit/browser/fileapi/external_mount_points.h" diff --git a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc index ca82f35..b25a5d5 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc +++ b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc @@ -20,11 +20,11 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/common/extension_builder.h" +#include "google_apis/drive/drive_api_parser.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/file_manager/file_watcher.cc b/chrome/browser/chromeos/file_manager/file_watcher.cc index 6a26414..8823630 100644 --- a/chrome/browser/chromeos/file_manager/file_watcher.cc +++ b/chrome/browser/chromeos/file_manager/file_watcher.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/message_loop/message_loop_proxy.h" -#include "chrome/browser/google_apis/task_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/task_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/file_manager/file_watcher_unittest.cc b/chrome/browser/chromeos/file_manager/file_watcher_unittest.cc index 4fd583a..773fd21 100644 --- a/chrome/browser/chromeos/file_manager/file_watcher_unittest.cc +++ b/chrome/browser/chromeos/file_manager/file_watcher_unittest.cc @@ -8,8 +8,8 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace file_manager { diff --git a/chrome/browser/chromeos/file_manager/open_util.cc b/chrome/browser/chromeos/file_manager/open_util.cc index ef75d71..e0e0bae 100644 --- a/chrome/browser/chromeos/file_manager/open_util.cc +++ b/chrome/browser/chromeos/file_manager/open_util.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/google_apis/task_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" @@ -31,6 +30,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/user_metrics.h" +#include "google_apis/drive/task_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "webkit/browser/fileapi/file_system_backend.h" diff --git a/chrome/browser/chromeos/net/onc_utils_unittest.cc b/chrome/browser/chromeos/net/onc_utils_unittest.cc index 9a84b4b..514a3fa 100644 --- a/chrome/browser/chromeos/net/onc_utils_unittest.cc +++ b/chrome/browser/chromeos/net/onc_utils_unittest.cc @@ -8,9 +8,9 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "chrome/browser/google_apis/test_util.h" #include "chromeos/network/network_ui_data.h" #include "chromeos/network/onc/onc_test_utils.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chrome/browser/drive/drive_api_service.cc b/chrome/browser/drive/drive_api_service.cc index 74c33f8..5732dc3 100644 --- a/chrome/browser/drive/drive_api_service.cc +++ b/chrome/browser/drive/drive_api_service.cc @@ -13,14 +13,14 @@ #include "base/task_runner_util.h" #include "base/values.h" #include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/google_apis/auth_service.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/drive_api_requests.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_requests.h" -#include "chrome/browser/google_apis/request_sender.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/auth_service.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/drive_api_requests.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_requests.h" +#include "google_apis/drive/request_sender.h" #include "net/url_request/url_request_context_getter.h" using content::BrowserThread; diff --git a/chrome/browser/drive/drive_api_service.h b/chrome/browser/drive/drive_api_service.h index a426100..1e2d88c 100644 --- a/chrome/browser/drive/drive_api_service.h +++ b/chrome/browser/drive/drive_api_service.h @@ -11,10 +11,10 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/auth_service_interface.h" -#include "chrome/browser/google_apis/auth_service_observer.h" -#include "chrome/browser/google_apis/drive_api_url_generator.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" +#include "google_apis/drive/auth_service_interface.h" +#include "google_apis/drive/auth_service_observer.h" +#include "google_apis/drive/drive_api_url_generator.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" class GURL; class OAuth2TokenService; diff --git a/chrome/browser/drive/drive_api_util.cc b/chrome/browser/drive/drive_api_util.cc index 845e5d2..de65402 100644 --- a/chrome/browser/drive/drive_api_util.cc +++ b/chrome/browser/drive/drive_api_util.cc @@ -17,9 +17,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/drive/drive_switches.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "net/base/escape.h" #include "third_party/re2/re2/re2.h" #include "url/gurl.h" diff --git a/chrome/browser/drive/drive_api_util.h b/chrome/browser/drive/drive_api_util.h index bce1785..7cbcbac 100644 --- a/chrome/browser/drive/drive_api_util.h +++ b/chrome/browser/drive/drive_api_util.h @@ -9,9 +9,9 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/drive_common_callbacks.h" -#include "chrome/browser/google_apis/drive_entry_kinds.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/drive_common_callbacks.h" +#include "google_apis/drive/drive_entry_kinds.h" +#include "google_apis/drive/gdata_errorcode.h" class GURL; diff --git a/chrome/browser/drive/drive_api_util_unittest.cc b/chrome/browser/drive/drive_api_util_unittest.cc index 2b1ecf1..570f9e9 100644 --- a/chrome/browser/drive/drive_api_util_unittest.cc +++ b/chrome/browser/drive/drive_api_util_unittest.cc @@ -6,9 +6,9 @@ #include "base/files/scoped_temp_dir.h" #include "base/md5.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/drive/drive_service_interface.h b/chrome/browser/drive/drive_service_interface.h index 33c7f80..deeaf2b 100644 --- a/chrome/browser/drive/drive_service_interface.h +++ b/chrome/browser/drive/drive_service_interface.h @@ -7,9 +7,9 @@ #include <string> -#include "chrome/browser/google_apis/auth_service_interface.h" -#include "chrome/browser/google_apis/base_requests.h" -#include "chrome/browser/google_apis/drive_common_callbacks.h" +#include "google_apis/drive/auth_service_interface.h" +#include "google_apis/drive/base_requests.h" +#include "google_apis/drive/drive_common_callbacks.h" namespace base { class Time; diff --git a/chrome/browser/drive/drive_uploader.cc b/chrome/browser/drive/drive_uploader.cc index 30ab0b9c..b849e6f 100644 --- a/chrome/browser/drive/drive_uploader.cc +++ b/chrome/browser/drive/drive_uploader.cc @@ -12,9 +12,9 @@ #include "base/strings/string_number_conversions.h" #include "base/task_runner_util.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/power_save_blocker.h" +#include "google_apis/drive/gdata_wapi_parser.h" using content::BrowserThread; using google_apis::CancelCallback; diff --git a/chrome/browser/drive/drive_uploader.h b/chrome/browser/drive/drive_uploader.h index cdbb26b..db0bafe 100644 --- a/chrome/browser/drive/drive_uploader.h +++ b/chrome/browser/drive/drive_uploader.h @@ -12,8 +12,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/gdata_wapi_parser.h" class GURL; diff --git a/chrome/browser/drive/drive_uploader_unittest.cc b/chrome/browser/drive/drive_uploader_unittest.cc index 0d8d636..139e014 100644 --- a/chrome/browser/drive/drive_uploader_unittest.cc +++ b/chrome/browser/drive/drive_uploader_unittest.cc @@ -14,8 +14,8 @@ #include "base/run_loop.h" #include "base/values.h" #include "chrome/browser/drive/dummy_drive_service.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" using google_apis::CancelCallback; diff --git a/chrome/browser/drive/dummy_drive_service.h b/chrome/browser/drive/dummy_drive_service.h index 6acaa2d..4864125 100644 --- a/chrome/browser/drive/dummy_drive_service.h +++ b/chrome/browser/drive/dummy_drive_service.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DRIVE_DUMMY_DRIVE_SERVICE_H_ #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/auth_service_interface.h" +#include "google_apis/drive/auth_service_interface.h" namespace drive { diff --git a/chrome/browser/drive/fake_drive_service.cc b/chrome/browser/drive/fake_drive_service.cc index 5fcc4d1..66ef7c0 100644 --- a/chrome/browser/drive/fake_drive_service.cc +++ b/chrome/browser/drive/fake_drive_service.cc @@ -17,11 +17,11 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" -#include "chrome/browser/google_apis/time_util.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" +#include "google_apis/drive/time_util.h" #include "net/base/escape.h" #include "net/base/url_util.h" diff --git a/chrome/browser/drive/fake_drive_service.h b/chrome/browser/drive/fake_drive_service.h index 8ef85bc..e09afcb 100644 --- a/chrome/browser/drive/fake_drive_service.h +++ b/chrome/browser/drive/fake_drive_service.h @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/values.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/auth_service_interface.h" +#include "google_apis/drive/auth_service_interface.h" namespace drive { diff --git a/chrome/browser/drive/fake_drive_service_unittest.cc b/chrome/browser/drive/fake_drive_service_unittest.cc index def1542..7692cc0 100644 --- a/chrome/browser/drive/fake_drive_service_unittest.cc +++ b/chrome/browser/drive/fake_drive_service_unittest.cc @@ -14,11 +14,11 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_requests.h" -#include "chrome/browser/google_apis/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_requests.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" using google_apis::AboutResource; diff --git a/chrome/browser/drive/gdata_wapi_service.cc b/chrome/browser/drive/gdata_wapi_service.cc index ad42f9d..c3c139c 100644 --- a/chrome/browser/drive/gdata_wapi_service.cc +++ b/chrome/browser/drive/gdata_wapi_service.cc @@ -12,14 +12,14 @@ #include "base/sequenced_task_runner.h" #include "base/values.h" #include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/google_apis/auth_service.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_requests.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" -#include "chrome/browser/google_apis/request_sender.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/auth_service.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_requests.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" +#include "google_apis/drive/request_sender.h" #include "net/url_request/url_request_context_getter.h" using content::BrowserThread; diff --git a/chrome/browser/drive/gdata_wapi_service.h b/chrome/browser/drive/gdata_wapi_service.h index 090b6ba..980ce47 100644 --- a/chrome/browser/drive/gdata_wapi_service.h +++ b/chrome/browser/drive/gdata_wapi_service.h @@ -12,10 +12,10 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/auth_service_interface.h" -#include "chrome/browser/google_apis/auth_service_observer.h" -#include "chrome/browser/google_apis/gdata_wapi_requests.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" +#include "google_apis/drive/auth_service_interface.h" +#include "google_apis/drive/auth_service_observer.h" +#include "google_apis/drive/gdata_wapi_requests.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" class GURL; class OAuth2TokenService; diff --git a/chrome/browser/google_apis/DEPS b/chrome/browser/google_apis/DEPS deleted file mode 100644 index 5dce014..0000000 --- a/chrome/browser/google_apis/DEPS +++ /dev/null @@ -1,5 +0,0 @@ -include_rules = [ - "-chrome", - "-content", - "+chrome/browser/google_apis", -] diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc index 29df925..00e90e6 100644 --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc @@ -10,12 +10,12 @@ #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" +#include "google_apis/drive/drive_api_parser.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h index 5daadf8..70c23c1 100644 --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h @@ -10,9 +10,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" #include "chrome/browser/sync_file_system/sync_task.h" +#include "google_apis/drive/gdata_errorcode.h" namespace drive { class DriveServiceInterface; diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc index 1a568e9..d5688e7 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc @@ -7,11 +7,11 @@ #include <set> #include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/drive_entry_kinds.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/drive_entry_kinds.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h index 46ac356..6a2a44f 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_DRIVE_BACKEND_TEST_UTIL_H_ #include "base/memory/scoped_ptr.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/sync_status_code.h" +#include "google_apis/drive/gdata_errorcode.h" namespace google_apis { class FileResource; diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc index c8355bd..fdcd188 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc @@ -10,10 +10,10 @@ #include "base/message_loop/message_loop_proxy.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "net/base/mime_util.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc index 7f804ea..886db8c 100644 --- a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc @@ -8,13 +8,13 @@ #include "base/location.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task.h b/chrome/browser/sync_file_system/drive_backend/list_changes_task.h index d7006e4..ec57ac2 100644 --- a/chrome/browser/sync_file_system/drive_backend/list_changes_task.h +++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task.h @@ -8,9 +8,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" #include "chrome/browser/sync_file_system/sync_task.h" +#include "google_apis/drive/gdata_errorcode.h" namespace drive { class DriveServiceInterface; diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc index 0c495a7..5a9700a 100644 --- a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc @@ -8,7 +8,6 @@ #include "base/format_macros.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/register_app_task.h" @@ -17,6 +16,7 @@ #include "chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/drive_api_parser.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc index 14538b4..414d6a0 100644 --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc @@ -15,12 +15,12 @@ #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" +#include "google_apis/drive/drive_api_parser.h" #include "webkit/common/fileapi/file_system_util.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h index 7ecbffa..b52a67e 100644 --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h @@ -8,12 +8,12 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/file_change.h" #include "chrome/browser/sync_file_system/sync_action.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" #include "chrome/browser/sync_file_system/sync_file_metadata.h" #include "chrome/browser/sync_file_system/sync_task.h" +#include "google_apis/drive/gdata_errorcode.h" namespace drive { class DriveServiceInterface; diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc index 962394d..60de398 100644 --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc @@ -11,7 +11,6 @@ #include "base/run_loop.h" #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h" #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h" @@ -24,6 +23,7 @@ #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/gdata_errorcode.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc index fc813df..e090e7e 100644 --- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc @@ -21,14 +21,14 @@ #include "base/task_runner_util.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/drive_entry_kinds.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/drive_entry_kinds.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" #include "webkit/common/fileapi/file_system_util.h" diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc index ecf85e2..ad2071e 100644 --- a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc @@ -9,12 +9,12 @@ #include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop_proxy.h" #include "base/strings/string_number_conversions.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" +#include "google_apis/drive/drive_api_parser.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task.cc index d42f7a7..dd5c6b3 100644 --- a/chrome/browser/sync_file_system/drive_backend/register_app_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/register_app_task.cc @@ -8,14 +8,14 @@ #include "base/location.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/drive_backend/tracker_set.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task.h b/chrome/browser/sync_file_system/drive_backend/register_app_task.h index 53cc1e1..263fb33 100644 --- a/chrome/browser/sync_file_system/drive_backend/register_app_task.h +++ b/chrome/browser/sync_file_system/drive_backend/register_app_task.h @@ -7,9 +7,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" #include "chrome/browser/sync_file_system/sync_task.h" +#include "google_apis/drive/gdata_errorcode.h" namespace drive { class DriveServiceInterface; diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc index 64ac452..a2e3b05 100644 --- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc @@ -11,7 +11,6 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" @@ -20,6 +19,7 @@ #include "chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc index cedfe39..7d662e3 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc @@ -12,14 +12,14 @@ #include "base/task_runner_util.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" #include "extensions/common/extension.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h index 8dc235e..373725a 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h @@ -10,13 +10,13 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/remote_change_processor.h" #include "chrome/browser/sync_file_system/sync_action.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" #include "chrome/browser/sync_file_system/sync_file_metadata.h" #include "chrome/browser/sync_file_system/sync_task.h" +#include "google_apis/drive/gdata_errorcode.h" #include "webkit/browser/fileapi/file_system_url.h" namespace drive { diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc index e0230d3..2c45624 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc @@ -13,7 +13,6 @@ #include "base/run_loop.h" #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h" #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h" @@ -25,6 +24,7 @@ #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/gdata_errorcode.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc index c0b0d91..3ce682c 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc @@ -16,8 +16,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system_factory.h" -#include "chrome/browser/google_apis/drive_api_url_generator.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -36,6 +34,8 @@ #include "chrome/browser/sync_file_system/syncable_file_system_util.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/extension.h" +#include "google_apis/drive/drive_api_url_generator.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" #include "webkit/common/blob/scoped_file.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc index 3c08228..30e024e 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc @@ -9,11 +9,11 @@ #include "base/logging.h" #include "chrome/browser/drive/drive_api_service.h" #include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h index 5f39800..7ba5e81 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h @@ -10,10 +10,10 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner.h" -#include "chrome/browser/google_apis/drive_common_callbacks.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" #include "chrome/browser/sync_file_system/sync_task.h" +#include "google_apis/drive/drive_common_callbacks.h" +#include "google_apis/drive/gdata_errorcode.h" namespace drive { class DriveServiceInterface; diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc index 4dd8a71..c46d9f1 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc @@ -9,14 +9,14 @@ #include "base/run_loop.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc index 5f47869..f7954a1 100644 --- a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc @@ -8,14 +8,14 @@ #include "base/location.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/drive_backend/tracker_set.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h index 2c0bf06..441f134 100644 --- a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h +++ b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h @@ -7,10 +7,10 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/remote_file_sync_service.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" #include "chrome/browser/sync_file_system/sync_task.h" +#include "google_apis/drive/gdata_errorcode.h" namespace drive { class DriveServiceInterface; diff --git a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc index 2dcd602..6c26105 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc @@ -19,7 +19,6 @@ #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/drive/gdata_wapi_service.h" -#include "chrome/browser/google_apis/drive_api_parser.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -29,6 +28,7 @@ #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "google_apis/drive/drive_api_parser.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend_v1/api_util.h b/chrome/browser/sync_file_system/drive_backend_v1/api_util.h index 4208f72..3196f4e 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/api_util.h +++ b/chrome/browser/sync_file_system/drive_backend_v1/api_util.h @@ -11,9 +11,9 @@ #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/google_apis/drive_api_url_generator.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" #include "chrome/browser/sync_file_system/drive_backend_v1/api_util_interface.h" +#include "google_apis/drive/drive_api_url_generator.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" #include "net/base/network_change_notifier.h" #include "webkit/common/blob/scoped_file.h" diff --git a/chrome/browser/sync_file_system/drive_backend_v1/api_util_interface.h b/chrome/browser/sync_file_system/drive_backend_v1/api_util_interface.h index 4b9e96f..21237f3d 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/api_util_interface.h +++ b/chrome/browser/sync_file_system/drive_backend_v1/api_util_interface.h @@ -8,8 +8,8 @@ #include <string> #include "base/callback_forward.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/gdata_wapi_parser.h" class GURL; class Profile; diff --git a/chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc b/chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc index feaa9aa..2b4b90a 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc @@ -12,14 +12,14 @@ #include "base/values.h" #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/test_util.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" #include "chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h" #include "chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/test_util.h" #include "net/base/escape.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc index 9d8ec48..ac07036 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc @@ -14,10 +14,6 @@ #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" #include "chrome/browser/sync_file_system/drive_backend_v1/api_util.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.h" @@ -33,6 +29,10 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/id_util.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/common/fileapi/file_system_util.h" diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h index 9f1ac17..22f6229 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h +++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_DRIVE_FILE_SYNC_UTIL_H_ #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_DRIVE_FILE_SYNC_UTIL_H_ -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/sync_status_code.h" +#include "google_apis/drive/gdata_errorcode.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util.cc b/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util.cc index a7f074f..fb53f35 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/message_loop/message_loop_proxy.h" -#include "chrome/browser/google_apis/drive_entry_kinds.h" +#include "google_apis/drive/drive_entry_kinds.h" #include "webkit/common/blob/scoped_file.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util.h b/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util.h index df8ef6b..55fadd1 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util.h +++ b/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util.h @@ -8,11 +8,11 @@ #include <map> #include <string> -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" #include "chrome/browser/sync_file_system/drive_backend_v1/api_util_interface.h" #include "chrome/browser/sync_file_system/sync_file_type.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" class GURL; class Profile; diff --git a/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util_unittest.cc b/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util_unittest.cc index af8409f..9fb3fbc 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/fake_api_util_unittest.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/common/blob/scoped_file.h" diff --git a/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.cc b/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.cc index 7871f70..430f94e 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.cc @@ -9,12 +9,12 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/threading/sequenced_worker_pool.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/sync_file_system/drive_backend_v1/api_util.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "chrome/browser/sync_file_system/sync_status_code.h" #include "content/public/test/test_browser_thread.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h b/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h index 7aa2af6..76a68b5 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h +++ b/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h @@ -10,7 +10,7 @@ #include "base/files/scoped_temp_dir.h" #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" namespace base { class FilePath; diff --git a/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.h b/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.h index d97fd36..a9497ab 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.h +++ b/chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.h @@ -12,10 +12,10 @@ #include "base/values.h" #include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/test_util.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" #include "chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/test_util.h" #include "net/base/escape.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/sync_file_system_test_util.cc b/chrome/browser/sync_file_system/sync_file_system_test_util.cc index c6f6767..1c285e8 100644 --- a/chrome/browser/sync_file_system/sync_file_system_test_util.cc +++ b/chrome/browser/sync_file_system/sync_file_system_test_util.cc @@ -5,9 +5,9 @@ #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "base/run_loop.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/sync_file_system/sync_status_code.h" #include "content/public/test/test_utils.h" +#include "google_apis/drive/gdata_errorcode.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc index 3e261d0..bf2f7d9 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc @@ -28,11 +28,6 @@ #include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/drive/drive_switches.h" #include "chrome/browser/drive/event_logger.h" -#include "chrome/browser/google_apis/auth_service.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/time_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -41,6 +36,11 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" +#include "google_apis/drive/auth_service.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/time_util.h" #include "grit/browser_resources.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc index f9b1666..d0a4adfb 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc @@ -10,7 +10,6 @@ #include "chrome/browser/drive/drive_notification_manager.h" #include "chrome/browser/drive/drive_notification_manager_factory.h" #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h" -#include "chrome/browser/google_apis/time_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/sync_file_system_service.h" @@ -19,6 +18,7 @@ #include "chrome/common/extensions/api/sync_file_system.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_ui.h" +#include "google_apis/drive/time_util.h" using drive::EventLogger; using sync_file_system::SyncFileSystemServiceFactory; diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 3a4e7cf..88de04f 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -691,38 +691,6 @@ 'browser/google/google_util.h', 'browser/google/google_util_chromeos.cc', 'browser/google/google_util_chromeos.h', - 'browser/google_apis/auth_service.cc', - 'browser/google_apis/auth_service.h', - 'browser/google_apis/auth_service_interface.h', - 'browser/google_apis/auth_service_observer.h', - 'browser/google_apis/base_requests.cc', - 'browser/google_apis/base_requests.h', - 'browser/google_apis/drive_api_parser.cc', - 'browser/google_apis/drive_api_parser.h', - 'browser/google_apis/drive_api_requests.cc', - 'browser/google_apis/drive_api_requests.h', - 'browser/google_apis/drive_api_url_generator.cc', - 'browser/google_apis/drive_api_url_generator.h', - 'browser/google_apis/drive_common_callbacks.h', - 'browser/google_apis/drive_entry_kinds.h', - 'browser/google_apis/gdata_contacts_requests.cc', - 'browser/google_apis/gdata_contacts_requests.h', - 'browser/google_apis/gdata_errorcode.cc', - 'browser/google_apis/gdata_errorcode.h', - 'browser/google_apis/gdata_wapi_requests.cc', - 'browser/google_apis/gdata_wapi_requests.h', - 'browser/google_apis/gdata_wapi_parser.cc', - 'browser/google_apis/gdata_wapi_parser.h', - 'browser/google_apis/gdata_wapi_url_generator.cc', - 'browser/google_apis/gdata_wapi_url_generator.h', - 'browser/google_apis/request_sender.cc', - 'browser/google_apis/request_sender.h', - 'browser/google_apis/request_util.cc', - 'browser/google_apis/request_util.h', - 'browser/google_apis/task_util.cc', - 'browser/google_apis/task_util.h', - 'browser/google_apis/time_util.cc', - 'browser/google_apis/time_util.h', 'browser/gpu/gl_string_manager.cc', 'browser/gpu/gl_string_manager.h', 'browser/gpu/gpu_feature_checker.cc', @@ -3349,8 +3317,6 @@ 'browser/feedback/proto/common.proto', 'browser/feedback/proto/dom.proto', 'browser/feedback/proto/math.proto', - 'browser/google_apis/gdata_contacts_requests.cc', - 'browser/google_apis/gdata_errorcode.cc', 'browser/gpu/chrome_gpu_util.cc', 'browser/idle_android.cc', 'browser/idle.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 86c9ba9..de380fe 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -45,6 +45,10 @@ '../extensions/common/extension_builder.h', '../extensions/common/value_builder.cc', '../extensions/common/value_builder.h', + '../google_apis/drive/dummy_auth_service.cc', + '../google_apis/drive/dummy_auth_service.h', + '../google_apis/drive/test_util.cc', + '../google_apis/drive/test_util.h', 'app/chrome_main_delegate.cc', 'app/chrome_main_delegate.h', 'browser/android/bookmarks/partner_bookmarks_shim_unittest.cc', @@ -135,10 +139,6 @@ 'browser/extensions/test_extension_service.h', 'browser/extensions/test_extension_system.cc', 'browser/extensions/test_extension_system.h', - 'browser/google_apis/dummy_auth_service.cc', - 'browser/google_apis/dummy_auth_service.h', - 'browser/google_apis/test_util.cc', - 'browser/google_apis/test_util.h', 'browser/media_galleries/media_galleries_test_util.cc', 'browser/media_galleries/media_galleries_test_util.h', 'browser/net/dns_probe_test_util.cc', @@ -941,17 +941,6 @@ 'browser/google/google_update_settings_unittest.cc', 'browser/google/google_url_tracker_unittest.cc', 'browser/google/google_util_unittest.cc', - 'browser/google_apis/base_requests_unittest.cc', - 'browser/google_apis/base_requests_server_unittest.cc', - 'browser/google_apis/drive_api_requests_unittest.cc', - 'browser/google_apis/drive_api_parser_unittest.cc', - 'browser/google_apis/drive_api_url_generator_unittest.cc', - 'browser/google_apis/gdata_wapi_parser_unittest.cc', - 'browser/google_apis/gdata_wapi_requests_unittest.cc', - 'browser/google_apis/gdata_wapi_url_generator_unittest.cc', - 'browser/google_apis/request_sender_unittest.cc', - 'browser/google_apis/request_util_unittest.cc', - 'browser/google_apis/time_util_unittest.cc', 'browser/history/android/android_cache_database_unittest.cc', 'browser/history/android/android_history_provider_service_unittest.cc', 'browser/history/android/android_history_types_unittest.cc', @@ -2018,6 +2007,17 @@ # google_apis_unittests executable. '../google_apis/google_api_keys_unittest.cc', '../google_apis/cup/client_update_protocol_unittest.cc', + '../google_apis/drive/base_requests_unittest.cc', + '../google_apis/drive/base_requests_server_unittest.cc', + '../google_apis/drive/drive_api_requests_unittest.cc', + '../google_apis/drive/drive_api_parser_unittest.cc', + '../google_apis/drive/drive_api_url_generator_unittest.cc', + '../google_apis/drive/gdata_wapi_parser_unittest.cc', + '../google_apis/drive/gdata_wapi_requests_unittest.cc', + '../google_apis/drive/gdata_wapi_url_generator_unittest.cc', + '../google_apis/drive/request_sender_unittest.cc', + '../google_apis/drive/request_util_unittest.cc', + '../google_apis/drive/time_util_unittest.cc', '../google_apis/gaia/mock_url_fetcher_factory.h', '../google_apis/gaia/gaia_auth_fetcher_unittest.cc', '../google_apis/gaia/gaia_auth_util_unittest.cc', @@ -2645,13 +2645,13 @@ # Test files cannot be opened on Android. 'browser/drive/fake_drive_service_unittest.cc', - 'browser/google_apis/base_requests_server_unittest.cc', - 'browser/google_apis/drive_api_parser_unittest.cc', - 'browser/google_apis/drive_api_requests_unittest.cc', - 'browser/google_apis/gdata_wapi_parser_unittest.cc', - 'browser/google_apis/gdata_wapi_requests_unittest.cc', 'browser/sync_file_system/drive_backend/api_util_unittest.cc', 'browser/sync_file_system/drive_backend/drive_file_sync_service_sync_unittest.cc', + '../google_apis/drive/base_requests_server_unittest.cc', + '../google_apis/drive/drive_api_parser_unittest.cc', + '../google_apis/drive/drive_api_requests_unittest.cc', + '../google_apis/drive/gdata_wapi_parser_unittest.cc', + '../google_apis/drive/gdata_wapi_requests_unittest.cc', # The autofill popup is implemented in mostly native code on # Android. diff --git a/google_apis/drive/DEPS b/google_apis/drive/DEPS new file mode 100644 index 0000000..5827c26 --- /dev/null +++ b/google_apis/drive/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+third_party/libxml", +] diff --git a/chrome/browser/google_apis/OWNERS b/google_apis/drive/OWNERS index 3db88c0..3db88c0 100644 --- a/chrome/browser/google_apis/OWNERS +++ b/google_apis/drive/OWNERS diff --git a/chrome/browser/google_apis/auth_service.cc b/google_apis/drive/auth_service.cc index e9dca03..1862368 100644 --- a/chrome/browser/google_apis/auth_service.cc +++ b/google_apis/drive/auth_service.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/auth_service.h" +#include "google_apis/drive/auth_service.h" #include <string> #include <vector> @@ -11,7 +11,7 @@ #include "base/location.h" #include "base/message_loop/message_loop_proxy.h" #include "base/metrics/histogram.h" -#include "chrome/browser/google_apis/auth_service_observer.h" +#include "google_apis/drive/auth_service_observer.h" #include "google_apis/gaia/google_service_auth_error.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/google_apis/auth_service.h b/google_apis/drive/auth_service.h index 43f4707..f055a1c 100644 --- a/chrome/browser/google_apis/auth_service.h +++ b/google_apis/drive/auth_service.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_AUTH_SERVICE_H_ -#define CHROME_BROWSER_GOOGLE_APIS_AUTH_SERVICE_H_ +#ifndef GOOGLE_APIS_DRIVE_AUTH_SERVICE_H_ +#define GOOGLE_APIS_DRIVE_AUTH_SERVICE_H_ #include <string> #include <vector> @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" -#include "chrome/browser/google_apis/auth_service_interface.h" +#include "google_apis/drive/auth_service_interface.h" #include "google_apis/gaia/oauth2_token_service.h" namespace net { @@ -81,4 +81,4 @@ class AuthService : public AuthServiceInterface, } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_AUTH_SERVICE_H_ +#endif // GOOGLE_APIS_DRIVE_AUTH_SERVICE_H_ diff --git a/chrome/browser/google_apis/auth_service_interface.h b/google_apis/drive/auth_service_interface.h index 0f1d1041..40a1905 100644 --- a/chrome/browser/google_apis/auth_service_interface.h +++ b/google_apis/drive/auth_service_interface.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_AUTH_SERVICE_INTERFACE_H_ -#define CHROME_BROWSER_GOOGLE_APIS_AUTH_SERVICE_INTERFACE_H_ +#ifndef GOOGLE_APIS_DRIVE_AUTH_SERVICE_INTERFACE_H_ +#define GOOGLE_APIS_DRIVE_AUTH_SERVICE_INTERFACE_H_ #include <string> #include "base/callback_forward.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace google_apis { @@ -55,4 +55,4 @@ class AuthServiceInterface { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_AUTH_SERVICE_INTERFACE_H_ +#endif // GOOGLE_APIS_DRIVE_AUTH_SERVICE_INTERFACE_H_ diff --git a/chrome/browser/google_apis/auth_service_observer.h b/google_apis/drive/auth_service_observer.h index 44c5d08..2fefbf2 100644 --- a/chrome/browser/google_apis/auth_service_observer.h +++ b/google_apis/drive/auth_service_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_AUTH_SERVICE_OBSERVER_H_ -#define CHROME_BROWSER_GOOGLE_APIS_AUTH_SERVICE_OBSERVER_H_ +#ifndef GOOGLE_APIS_DRIVE_AUTH_SERVICE_OBSERVER_H_ +#define GOOGLE_APIS_DRIVE_AUTH_SERVICE_OBSERVER_H_ namespace google_apis { @@ -20,4 +20,4 @@ class AuthServiceObserver { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_AUTH_SERVICE_OBSERVER_H_ +#endif // GOOGLE_APIS_DRIVE_AUTH_SERVICE_OBSERVER_H_ diff --git a/chrome/browser/google_apis/base_requests.cc b/google_apis/drive/base_requests.cc index ba7345a..4a5ca70 100644 --- a/chrome/browser/google_apis/base_requests.cc +++ b/google_apis/drive/base_requests.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/base_requests.h" +#include "google_apis/drive/base_requests.h" #include "base/json/json_reader.h" #include "base/location.h" @@ -11,8 +11,8 @@ #include "base/strings/stringprintf.h" #include "base/task_runner_util.h" #include "base/values.h" -#include "chrome/browser/google_apis/request_sender.h" -#include "chrome/browser/google_apis/task_util.h" +#include "google_apis/drive/request_sender.h" +#include "google_apis/drive/task_util.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/google_apis/base_requests.h b/google_apis/drive/base_requests.h index cc9babd..e3aee90 100644 --- a/chrome/browser/google_apis/base_requests.h +++ b/google_apis/drive/base_requests.h @@ -5,8 +5,8 @@ // This file provides base classes used to issue HTTP requests for Google // APIs. -#ifndef CHROME_BROWSER_GOOGLE_APIS_BASE_REQUESTS_H_ -#define CHROME_BROWSER_GOOGLE_APIS_BASE_REQUESTS_H_ +#ifndef GOOGLE_APIS_DRIVE_BASE_REQUESTS_H_ +#define GOOGLE_APIS_DRIVE_BASE_REQUESTS_H_ #include <string> #include <vector> @@ -15,7 +15,7 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_fetcher_response_writer.h" @@ -533,4 +533,4 @@ class DownloadFileRequestBase : public UrlFetchRequestBase { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_BASE_REQUESTS_H_ +#endif // GOOGLE_APIS_DRIVE_BASE_REQUESTS_H_ diff --git a/chrome/browser/google_apis/base_requests_server_unittest.cc b/google_apis/drive/base_requests_server_unittest.cc index a66c25a..bd54fcb 100644 --- a/chrome/browser/google_apis/base_requests_server_unittest.cc +++ b/google_apis/drive/base_requests_server_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/base_requests.h" +#include "google_apis/drive/base_requests.h" #include "base/bind.h" #include "base/file_util.h" @@ -10,10 +10,10 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" -#include "chrome/browser/google_apis/dummy_auth_service.h" -#include "chrome/browser/google_apis/request_sender.h" -#include "chrome/browser/google_apis/task_util.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/dummy_auth_service.h" +#include "google_apis/drive/request_sender.h" +#include "google_apis/drive/task_util.h" +#include "google_apis/drive/test_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/chrome/browser/google_apis/base_requests_unittest.cc b/google_apis/drive/base_requests_unittest.cc index ca22d11..3032d2a 100644 --- a/chrome/browser/google_apis/base_requests_unittest.cc +++ b/google_apis/drive/base_requests_unittest.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/base_requests.h" +#include "google_apis/drive/base_requests.h" #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/values.h" -#include "chrome/browser/google_apis/dummy_auth_service.h" -#include "chrome/browser/google_apis/request_sender.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/dummy_auth_service.h" +#include "google_apis/drive/request_sender.h" +#include "google_apis/drive/test_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/chrome/browser/google_apis/drive_api_parser.cc b/google_apis/drive/drive_api_parser.cc index 5cbb079..c3cb669 100644 --- a/chrome/browser/google_apis/drive_api_parser.cc +++ b/google_apis/drive/drive_api_parser.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/drive_api_parser.h" +#include "google_apis/drive/drive_api_parser.h" #include <algorithm> @@ -14,7 +14,7 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/values.h" -#include "chrome/browser/google_apis/time_util.h" +#include "google_apis/drive/time_util.h" using base::Value; using base::DictionaryValue; diff --git a/chrome/browser/google_apis/drive_api_parser.h b/google_apis/drive/drive_api_parser.h index 45dd518..1f7ddb8 100644 --- a/chrome/browser/google_apis/drive_api_parser.h +++ b/google_apis/drive/drive_api_parser.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_PARSER_H_ -#define CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_PARSER_H_ +#ifndef GOOGLE_APIS_DRIVE_DRIVE_API_PARSER_H_ +#define GOOGLE_APIS_DRIVE_DRIVE_API_PARSER_H_ #include <string> @@ -847,4 +847,4 @@ class ChangeList { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_PARSER_H_ +#endif // GOOGLE_APIS_DRIVE_DRIVE_API_PARSER_H_ diff --git a/chrome/browser/google_apis/drive_api_parser_unittest.cc b/google_apis/drive/drive_api_parser_unittest.cc index c70aa89..4aae844 100644 --- a/chrome/browser/google_apis/drive_api_parser_unittest.cc +++ b/google_apis/drive/drive_api_parser_unittest.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/drive_api_parser.h" +#include "google_apis/drive/drive_api_parser.h" #include "base/time/time.h" #include "base/values.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/test_util.h" -#include "chrome/browser/google_apis/time_util.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/test_util.h" +#include "google_apis/drive/time_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace google_apis { diff --git a/chrome/browser/google_apis/drive_api_requests.cc b/google_apis/drive/drive_api_requests.cc index 8747adb..67e3ac2 100644 --- a/chrome/browser/google_apis/drive_api_requests.cc +++ b/google_apis/drive/drive_api_requests.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/drive_api_requests.h" +#include "google_apis/drive/drive_api_requests.h" #include "base/bind.h" #include "base/callback.h" @@ -11,10 +11,10 @@ #include "base/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "base/values.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/request_sender.h" -#include "chrome/browser/google_apis/request_util.h" -#include "chrome/browser/google_apis/time_util.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/request_sender.h" +#include "google_apis/drive/request_util.h" +#include "google_apis/drive/time_util.h" #include "net/base/url_util.h" namespace google_apis { diff --git a/chrome/browser/google_apis/drive_api_requests.h b/google_apis/drive/drive_api_requests.h index f660fc6..094ff4f 100644 --- a/chrome/browser/google_apis/drive_api_requests.h +++ b/google_apis/drive/drive_api_requests.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_REQUESTS_H_ -#define CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_REQUESTS_H_ +#ifndef GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_ +#define GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_ #include <string> #include "base/callback_forward.h" #include "base/time/time.h" -#include "chrome/browser/google_apis/base_requests.h" -#include "chrome/browser/google_apis/drive_api_url_generator.h" -#include "chrome/browser/google_apis/drive_common_callbacks.h" +#include "google_apis/drive/base_requests.h" +#include "google_apis/drive/drive_api_url_generator.h" +#include "google_apis/drive/drive_common_callbacks.h" namespace google_apis { @@ -699,4 +699,4 @@ class DownloadFileRequest : public DownloadFileRequestBase { } // namespace drive } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_REQUESTS_H_ +#endif // GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_ diff --git a/chrome/browser/google_apis/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc index 9a7c72c..ba95adf 100644 --- a/chrome/browser/google_apis/drive_api_requests_unittest.cc +++ b/google_apis/drive/drive_api_requests_unittest.cc @@ -10,12 +10,12 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/drive_api_requests.h" -#include "chrome/browser/google_apis/drive_api_url_generator.h" -#include "chrome/browser/google_apis/dummy_auth_service.h" -#include "chrome/browser/google_apis/request_sender.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/drive_api_requests.h" +#include "google_apis/drive/drive_api_url_generator.h" +#include "google_apis/drive/dummy_auth_service.h" +#include "google_apis/drive/request_sender.h" +#include "google_apis/drive/test_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/chrome/browser/google_apis/drive_api_url_generator.cc b/google_apis/drive/drive_api_url_generator.cc index b5dc805..3be0f29 100644 --- a/chrome/browser/google_apis/drive_api_url_generator.cc +++ b/google_apis/drive/drive_api_url_generator.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/drive_api_url_generator.h" +#include "google_apis/drive/drive_api_url_generator.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/google_apis/drive_api_url_generator.h b/google_apis/drive/drive_api_url_generator.h index a9b15dd..a7e20a6 100644 --- a/chrome/browser/google_apis/drive_api_url_generator.h +++ b/google_apis/drive/drive_api_url_generator.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_URL_GENERATOR_H_ -#define CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_URL_GENERATOR_H_ +#ifndef GOOGLE_APIS_DRIVE_DRIVE_API_URL_GENERATOR_H_ +#define GOOGLE_APIS_DRIVE_DRIVE_API_URL_GENERATOR_H_ #include <string> @@ -87,4 +87,4 @@ class DriveApiUrlGenerator { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_URL_GENERATOR_H_ +#endif // GOOGLE_APIS_DRIVE_DRIVE_API_URL_GENERATOR_H_ diff --git a/chrome/browser/google_apis/drive_api_url_generator_unittest.cc b/google_apis/drive/drive_api_url_generator_unittest.cc index 2053917..b9afb6f 100644 --- a/chrome/browser/google_apis/drive_api_url_generator_unittest.cc +++ b/google_apis/drive/drive_api_url_generator_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/drive_api_url_generator.h" +#include "google_apis/drive/drive_api_url_generator.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/google_apis/drive_common_callbacks.h b/google_apis/drive/drive_common_callbacks.h index a7a35a2..c31bea0 100644 --- a/chrome/browser/google_apis/drive_common_callbacks.h +++ b/google_apis/drive/drive_common_callbacks.h @@ -5,10 +5,10 @@ // This file contains callback types used for communicating with the Drive // server via WAPI (Documents List API) and Drive API. -#ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_COMMON_CALLBACKS_H_ -#define CHROME_BROWSER_GOOGLE_APIS_DRIVE_COMMON_CALLBACKS_H_ +#ifndef GOOGLE_APIS_DRIVE_DRIVE_COMMON_CALLBACKS_H_ +#define GOOGLE_APIS_DRIVE_DRIVE_COMMON_CALLBACKS_H_ -#include "chrome/browser/google_apis/base_requests.h" +#include "google_apis/drive/base_requests.h" namespace google_apis { @@ -59,4 +59,4 @@ typedef base::Closure CancelCallback; } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_DRIVE_COMMON_CALLBACKS_H_ +#endif // GOOGLE_APIS_DRIVE_DRIVE_COMMON_CALLBACKS_H_ diff --git a/chrome/browser/google_apis/drive_entry_kinds.h b/google_apis/drive/drive_entry_kinds.h index c64c4e4..27e0f69 100644 --- a/chrome/browser/google_apis/drive_entry_kinds.h +++ b/google_apis/drive/drive_entry_kinds.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_ENTRY_KINDS_H_ -#define CHROME_BROWSER_GOOGLE_APIS_DRIVE_ENTRY_KINDS_H_ +#ifndef GOOGLE_APIS_DRIVE_DRIVE_ENTRY_KINDS_H_ +#define GOOGLE_APIS_DRIVE_DRIVE_ENTRY_KINDS_H_ namespace google_apis { @@ -37,4 +37,4 @@ enum DriveEntryKind { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_DRIVE_ENTRY_KINDS_H_ +#endif // GOOGLE_APIS_DRIVE_DRIVE_ENTRY_KINDS_H_ diff --git a/chrome/browser/google_apis/dummy_auth_service.cc b/google_apis/drive/dummy_auth_service.cc index d5ceb76..e1b6891 100644 --- a/chrome/browser/google_apis/dummy_auth_service.cc +++ b/google_apis/drive/dummy_auth_service.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/dummy_auth_service.h" +#include "google_apis/drive/dummy_auth_service.h" namespace google_apis { diff --git a/chrome/browser/google_apis/dummy_auth_service.h b/google_apis/drive/dummy_auth_service.h index e42a4bc..a69da6b 100644 --- a/chrome/browser/google_apis/dummy_auth_service.h +++ b/google_apis/drive/dummy_auth_service.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_DUMMY_AUTH_SERVICE_H_ -#define CHROME_BROWSER_GOOGLE_APIS_DUMMY_AUTH_SERVICE_H_ +#ifndef GOOGLE_APIS_DRIVE_DUMMY_AUTH_SERVICE_H_ +#define GOOGLE_APIS_DRIVE_DUMMY_AUTH_SERVICE_H_ #include "base/compiler_specific.h" -#include "chrome/browser/google_apis/auth_service_interface.h" +#include "google_apis/drive/auth_service_interface.h" namespace google_apis { @@ -40,4 +40,4 @@ class DummyAuthService : public AuthServiceInterface { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_DUMMY_AUTH_SERVICE_H_ +#endif // GOOGLE_APIS_DRIVE_DUMMY_AUTH_SERVICE_H_ diff --git a/chrome/browser/google_apis/gdata_contacts_requests.cc b/google_apis/drive/gdata_contacts_requests.cc index 3d3e6d4..11419af 100644 --- a/chrome/browser/google_apis/gdata_contacts_requests.cc +++ b/google_apis/drive/gdata_contacts_requests.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/gdata_contacts_requests.h" +#include "google_apis/drive/gdata_contacts_requests.h" -#include "chrome/browser/google_apis/time_util.h" +#include "google_apis/drive/time_util.h" #include "net/base/url_util.h" #include "url/gurl.h" diff --git a/chrome/browser/google_apis/gdata_contacts_requests.h b/google_apis/drive/gdata_contacts_requests.h index ee36024..05ce693 100644 --- a/chrome/browser/google_apis/gdata_contacts_requests.h +++ b/google_apis/drive/gdata_contacts_requests.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_CONTACTS_REQUESTS_H_ -#define CHROME_BROWSER_GOOGLE_APIS_GDATA_CONTACTS_REQUESTS_H_ +#ifndef GOOGLE_APIS_DRIVE_GDATA_CONTACTS_REQUESTS_H_ +#define GOOGLE_APIS_DRIVE_GDATA_CONTACTS_REQUESTS_H_ #include <string> #include "base/time/time.h" -#include "chrome/browser/google_apis/base_requests.h" +#include "google_apis/drive/base_requests.h" namespace google_apis { @@ -99,4 +99,4 @@ class GetContactPhotoRequest : public UrlFetchRequestBase { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_GDATA_CONTACTS_REQUESTS_H_ +#endif // GOOGLE_APIS_DRIVE_GDATA_CONTACTS_REQUESTS_H_ diff --git a/chrome/browser/google_apis/gdata_errorcode.cc b/google_apis/drive/gdata_errorcode.cc index dbb18d4..89fa3f3 100644 --- a/chrome/browser/google_apis/gdata_errorcode.cc +++ b/google_apis/drive/gdata_errorcode.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/google_apis/gdata_errorcode.h b/google_apis/drive/gdata_errorcode.h index 78ec352..a275cb3 100644 --- a/chrome/browser/google_apis/gdata_errorcode.h +++ b/google_apis/drive/gdata_errorcode.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_ERRORCODE_H_ -#define CHROME_BROWSER_GOOGLE_APIS_GDATA_ERRORCODE_H_ +#ifndef GOOGLE_APIS_DRIVE_GDATA_ERRORCODE_H_ +#define GOOGLE_APIS_DRIVE_GDATA_ERRORCODE_H_ #include <string> @@ -43,4 +43,4 @@ std::string GDataErrorCodeToString(GDataErrorCode error); } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_GDATA_ERRORCODE_H_ +#endif // GOOGLE_APIS_DRIVE_GDATA_ERRORCODE_H_ diff --git a/chrome/browser/google_apis/gdata_wapi_parser.cc b/google_apis/drive/gdata_wapi_parser.cc index d1d7b2f..82f9d43 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser.cc +++ b/google_apis/drive/gdata_wapi_parser.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include <algorithm> #include <string> @@ -16,7 +16,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/google_apis/time_util.h" +#include "google_apis/drive/time_util.h" using base::Value; using base::DictionaryValue; diff --git a/chrome/browser/google_apis/gdata_wapi_parser.h b/google_apis/drive/gdata_wapi_parser.h index ff2a65f..0c89c11 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser.h +++ b/google_apis/drive/gdata_wapi_parser.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_PARSER_H_ -#define CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_PARSER_H_ +#ifndef GOOGLE_APIS_DRIVE_GDATA_WAPI_PARSER_H_ +#define GOOGLE_APIS_DRIVE_GDATA_WAPI_PARSER_H_ #include <string> #include <utility> @@ -14,7 +14,7 @@ #include "base/memory/scoped_vector.h" #include "base/strings/string_piece.h" #include "base/time/time.h" -#include "chrome/browser/google_apis/drive_entry_kinds.h" +#include "google_apis/drive/drive_entry_kinds.h" #include "url/gurl.h" namespace base { @@ -863,4 +863,4 @@ class AccountMetadata { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_PARSER_H_ +#endif // GOOGLE_APIS_DRIVE_GDATA_WAPI_PARSER_H_ diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/google_apis/drive/gdata_wapi_parser_unittest.cc index 4c5d611..58728d1 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc +++ b/google_apis/drive/gdata_wapi_parser_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include <string> @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/time/time.h" #include "base/values.h" -#include "chrome/browser/google_apis/test_util.h" -#include "chrome/browser/google_apis/time_util.h" +#include "google_apis/drive/test_util.h" +#include "google_apis/drive/time_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace google_apis { diff --git a/chrome/browser/google_apis/gdata_wapi_requests.cc b/google_apis/drive/gdata_wapi_requests.cc index e0b305f..d0f6e53 100644 --- a/chrome/browser/google_apis/gdata_wapi_requests.cc +++ b/google_apis/drive/gdata_wapi_requests.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/gdata_wapi_requests.h" +#include "google_apis/drive/gdata_wapi_requests.h" #include "base/location.h" #include "base/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "base/values.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" -#include "chrome/browser/google_apis/request_sender.h" -#include "chrome/browser/google_apis/request_util.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" +#include "google_apis/drive/request_sender.h" +#include "google_apis/drive/request_util.h" #include "third_party/libxml/chromium/libxml_utils.h" using net::URLFetcher; diff --git a/chrome/browser/google_apis/gdata_wapi_requests.h b/google_apis/drive/gdata_wapi_requests.h index e646b75..26f713b 100644 --- a/chrome/browser/google_apis/gdata_wapi_requests.h +++ b/google_apis/drive/gdata_wapi_requests.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_REQUESTS_H_ -#define CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_REQUESTS_H_ +#ifndef GOOGLE_APIS_DRIVE_GDATA_WAPI_REQUESTS_H_ +#define GOOGLE_APIS_DRIVE_GDATA_WAPI_REQUESTS_H_ #include <string> #include <vector> -#include "chrome/browser/google_apis/base_requests.h" -#include "chrome/browser/google_apis/drive_common_callbacks.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" +#include "google_apis/drive/base_requests.h" +#include "google_apis/drive/drive_common_callbacks.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" namespace google_apis { @@ -513,4 +513,4 @@ class DownloadFileRequest : public DownloadFileRequestBase { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_REQUESTS_H_ +#endif // GOOGLE_APIS_DRIVE_GDATA_WAPI_REQUESTS_H_ diff --git a/chrome/browser/google_apis/gdata_wapi_requests_unittest.cc b/google_apis/drive/gdata_wapi_requests_unittest.cc index cbf89d4..d9c9e0d 100644 --- a/chrome/browser/google_apis/gdata_wapi_requests_unittest.cc +++ b/google_apis/drive/gdata_wapi_requests_unittest.cc @@ -16,12 +16,12 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/values.h" -#include "chrome/browser/google_apis/dummy_auth_service.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_requests.h" -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" -#include "chrome/browser/google_apis/request_sender.h" -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/dummy_auth_service.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_requests.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" +#include "google_apis/drive/request_sender.h" +#include "google_apis/drive/test_util.h" #include "net/base/escape.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" diff --git a/chrome/browser/google_apis/gdata_wapi_url_generator.cc b/google_apis/drive/gdata_wapi_url_generator.cc index 9d09bf1..c1263b7 100644 --- a/chrome/browser/google_apis/gdata_wapi_url_generator.cc +++ b/google_apis/drive/gdata_wapi_url_generator.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/google_apis/gdata_wapi_url_generator.h b/google_apis/drive/gdata_wapi_url_generator.h index 6781cf0..05b565d 100644 --- a/chrome/browser/google_apis/gdata_wapi_url_generator.h +++ b/google_apis/drive/gdata_wapi_url_generator.h @@ -4,8 +4,8 @@ // // URL utility functions for Google Documents List API (aka WAPI). -#ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_URL_GENERATOR_H_ -#define CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_URL_GENERATOR_H_ +#ifndef GOOGLE_APIS_DRIVE_GDATA_WAPI_URL_GENERATOR_H_ +#define GOOGLE_APIS_DRIVE_GDATA_WAPI_URL_GENERATOR_H_ #include <string> @@ -137,4 +137,4 @@ class GDataWapiUrlGenerator { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_URL_GENERATOR_H_ +#endif // GOOGLE_APIS_DRIVE_GDATA_WAPI_URL_GENERATOR_H_ diff --git a/chrome/browser/google_apis/gdata_wapi_url_generator_unittest.cc b/google_apis/drive/gdata_wapi_url_generator_unittest.cc index 8dd60dc..63db63d 100644 --- a/chrome/browser/google_apis/gdata_wapi_url_generator_unittest.cc +++ b/google_apis/drive/gdata_wapi_url_generator_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/gdata_wapi_url_generator.h" +#include "google_apis/drive/gdata_wapi_url_generator.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/google_apis/request_sender.cc b/google_apis/drive/request_sender.cc index 8c494cb..dbf5d85 100644 --- a/chrome/browser/google_apis/request_sender.cc +++ b/google_apis/drive/request_sender.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/request_sender.h" +#include "google_apis/drive/request_sender.h" #include "base/bind.h" #include "base/sequenced_task_runner.h" #include "base/stl_util.h" -#include "chrome/browser/google_apis/auth_service.h" -#include "chrome/browser/google_apis/base_requests.h" +#include "google_apis/drive/auth_service.h" +#include "google_apis/drive/base_requests.h" #include "net/url_request/url_request_context_getter.h" namespace google_apis { diff --git a/chrome/browser/google_apis/request_sender.h b/google_apis/drive/request_sender.h index 9bf8e91..dfc671c 100644 --- a/chrome/browser/google_apis/request_sender.h +++ b/google_apis/drive/request_sender.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_REQUEST_SENDER_H_ -#define CHROME_BROWSER_GOOGLE_APIS_REQUEST_SENDER_H_ +#ifndef GOOGLE_APIS_DRIVE_REQUEST_SENDER_H_ +#define GOOGLE_APIS_DRIVE_REQUEST_SENDER_H_ #include <set> #include <string> @@ -14,7 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" +#include "google_apis/drive/gdata_errorcode.h" namespace base { class SequencedTaskRunner; @@ -108,4 +108,4 @@ class RequestSender { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_REQUEST_SENDER_H_ +#endif // GOOGLE_APIS_DRIVE_REQUEST_SENDER_H_ diff --git a/chrome/browser/google_apis/request_sender_unittest.cc b/google_apis/drive/request_sender_unittest.cc index 0a65cc1..20f5402 100644 --- a/chrome/browser/google_apis/request_sender_unittest.cc +++ b/google_apis/drive/request_sender_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/request_sender.h" +#include "google_apis/drive/request_sender.h" #include "base/strings/string_number_conversions.h" -#include "chrome/browser/google_apis/base_requests.h" -#include "chrome/browser/google_apis/dummy_auth_service.h" +#include "google_apis/drive/base_requests.h" +#include "google_apis/drive/dummy_auth_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace google_apis { diff --git a/chrome/browser/google_apis/request_util.cc b/google_apis/drive/request_util.cc index 9062085..9737a6f 100644 --- a/chrome/browser/google_apis/request_util.cc +++ b/google_apis/drive/request_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/request_util.h" +#include "google_apis/drive/request_util.h" #include <string> diff --git a/chrome/browser/google_apis/request_util.h b/google_apis/drive/request_util.h index 087d851..f0672ed 100644 --- a/chrome/browser/google_apis/request_util.h +++ b/google_apis/drive/request_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_REQUEST_UTIL_H_ -#define CHROME_BROWSER_GOOGLE_APIS_REQUEST_UTIL_H_ +#ifndef GOOGLE_APIS_DRIVE_REQUEST_UTIL_H_ +#define GOOGLE_APIS_DRIVE_REQUEST_UTIL_H_ #include <string> @@ -20,4 +20,4 @@ std::string GenerateIfMatchHeader(const std::string& etag); } // namespace util } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_REQUEST_UTIL_H_ +#endif // GOOGLE_APIS_DRIVE_REQUEST_UTIL_H_ diff --git a/chrome/browser/google_apis/request_util_unittest.cc b/google_apis/drive/request_util_unittest.cc index 5d3262e..f1e703c 100644 --- a/chrome/browser/google_apis/request_util_unittest.cc +++ b/google_apis/drive/request_util_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/request_util.h" +#include "google_apis/drive/request_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/google_apis/task_util.cc b/google_apis/drive/task_util.cc index 64c47f6..3f149e4 100644 --- a/chrome/browser/google_apis/task_util.cc +++ b/google_apis/drive/task_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/task_util.h" +#include "google_apis/drive/task_util.h" #include "base/location.h" diff --git a/chrome/browser/google_apis/task_util.h b/google_apis/drive/task_util.h index 883a0e8..443f719 100644 --- a/chrome/browser/google_apis/task_util.h +++ b/google_apis/drive/task_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_TASK_UTIL_H_ -#define CHROME_BROWSER_GOOGLE_APIS_TASK_UTIL_H_ +#ifndef GOOGLE_APIS_DRIVE_TASK_UTIL_H_ +#define GOOGLE_APIS_DRIVE_TASK_UTIL_H_ #include "base/bind.h" #include "base/message_loop/message_loop_proxy.h" @@ -133,4 +133,4 @@ CallbackType CreateRelayCallback(const CallbackType& callback) { } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_TASK_UTIL_H_ +#endif // GOOGLE_APIS_DRIVE_TASK_UTIL_H_ diff --git a/chrome/browser/google_apis/test_util.cc b/google_apis/drive/test_util.cc index e1d18fc..89f8213 100644 --- a/chrome/browser/google_apis/test_util.cc +++ b/google_apis/drive/test_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/test_util.h" +#include "google_apis/drive/test_util.h" #include "base/file_util.h" #include "base/json/json_file_value_serializer.h" @@ -15,9 +15,9 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "chrome/browser/google_apis/drive_api_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_parser.h" -#include "chrome/browser/google_apis/gdata_wapi_requests.h" +#include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" +#include "google_apis/drive/gdata_wapi_requests.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" #include "url/gurl.h" diff --git a/chrome/browser/google_apis/test_util.h b/google_apis/drive/test_util.h index 2976937..2cd85b6 100644 --- a/chrome/browser/google_apis/test_util.h +++ b/google_apis/drive/test_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_ -#define CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_ +#ifndef GOOGLE_APIS_DRIVE_TEST_UTIL_H_ +#define GOOGLE_APIS_DRIVE_TEST_UTIL_H_ #include <string> #include <utility> @@ -14,9 +14,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/template_util.h" -#include "chrome/browser/google_apis/base_requests.h" -#include "chrome/browser/google_apis/gdata_errorcode.h" -#include "chrome/browser/google_apis/task_util.h" +#include "google_apis/drive/base_requests.h" +#include "google_apis/drive/gdata_errorcode.h" +#include "google_apis/drive/task_util.h" class GURL; @@ -296,4 +296,4 @@ class TestGetContentCallback { } // namespace test_util } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_ +#endif // GOOGLE_APIS_DRIVE_TEST_UTIL_H_ diff --git a/chrome/browser/google_apis/time_util.cc b/google_apis/drive/time_util.cc index 3c274b5..6ac55e9 100644 --- a/chrome/browser/google_apis/time_util.cc +++ b/google_apis/drive/time_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/time_util.h" +#include "google_apis/drive/time_util.h" #include <string> #include <vector> diff --git a/chrome/browser/google_apis/time_util.h b/google_apis/drive/time_util.h index fff81a7..f281d80 100644 --- a/chrome/browser/google_apis/time_util.h +++ b/google_apis/drive/time_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_GOOGLE_APIS_TIME_UTIL_H_ -#define CHROME_BROWSER_GOOGLE_APIS_TIME_UTIL_H_ +#ifndef GOOGLE_APIS_DRIVE_TIME_UTIL_H_ +#define GOOGLE_APIS_DRIVE_TIME_UTIL_H_ #include <string> @@ -32,4 +32,4 @@ std::string FormatTimeAsStringLocaltime(const base::Time& time); } // namespace util } // namespace google_apis -#endif // CHROME_BROWSER_GOOGLE_APIS_TIME_UTIL_H_ +#endif // GOOGLE_APIS_DRIVE_TIME_UTIL_H_ diff --git a/chrome/browser/google_apis/time_util_unittest.cc b/google_apis/drive/time_util_unittest.cc index 14c8c3c3..6d3abf6 100644 --- a/chrome/browser/google_apis/time_util_unittest.cc +++ b/google_apis/drive/time_util_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/google_apis/time_util.h" +#include "google_apis/drive/time_util.h" #include "base/i18n/time_formatting.h" #include "base/strings/utf_string_conversions.h" diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp index 762c3695..2d281f2 100644 --- a/google_apis/google_apis.gyp +++ b/google_apis/google_apis.gyp @@ -20,6 +20,7 @@ '../base/base.gyp:base', '../crypto/crypto.gyp:crypto', '../net/net.gyp:net', + '../third_party/libxml/libxml.gyp:libxml', ], 'conditions': [ ['google_api_key!=""', { @@ -58,6 +59,38 @@ 'cup/client_update_protocol.h', 'cup/client_update_protocol_nss.cc', 'cup/client_update_protocol_openssl.cc', + 'drive/auth_service.cc', + 'drive/auth_service.h', + 'drive/auth_service_interface.h', + 'drive/auth_service_observer.h', + 'drive/base_requests.cc', + 'drive/base_requests.h', + 'drive/drive_api_parser.cc', + 'drive/drive_api_parser.h', + 'drive/drive_api_requests.cc', + 'drive/drive_api_requests.h', + 'drive/drive_api_url_generator.cc', + 'drive/drive_api_url_generator.h', + 'drive/drive_common_callbacks.h', + 'drive/drive_entry_kinds.h', + 'drive/gdata_contacts_requests.cc', + 'drive/gdata_contacts_requests.h', + 'drive/gdata_errorcode.cc', + 'drive/gdata_errorcode.h', + 'drive/gdata_wapi_requests.cc', + 'drive/gdata_wapi_requests.h', + 'drive/gdata_wapi_parser.cc', + 'drive/gdata_wapi_parser.h', + 'drive/gdata_wapi_url_generator.cc', + 'drive/gdata_wapi_url_generator.h', + 'drive/request_sender.cc', + 'drive/request_sender.h', + 'drive/request_util.cc', + 'drive/request_util.h', + 'drive/task_util.cc', + 'drive/task_util.h', + 'drive/time_util.cc', + 'drive/time_util.h', 'gaia/gaia_auth_consumer.cc', 'gaia/gaia_auth_consumer.h', 'gaia/gaia_auth_fetcher.cc', |