diff options
Diffstat (limited to 'chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc')
| -rw-r--r-- | chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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 59ebf29..3a9e673 100644 --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc @@ -9,9 +9,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/strings/stringprintf.h" -#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/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" @@ -19,6 +16,9 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h" #include "chrome/browser/sync_file_system/logger.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/drive_api_parser.h" namespace sync_file_system { |