[SyncFS] Add DriveUploader to SyncEngineContext

[SyncFS] Add DriveUploader to SyncEngineContext

BUG=240165
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=235727

[tzik, 2013-11-18 11:35:32]

PTL

[kinuko, 2013-11-18 11:48:40]

lgtm

[nhiroki, 2013-11-18 11:51:42]

lgtm

[commit-bot: I haz the power, 2013-11-18 11:54:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tzik@chromium.org/73613003/30001

[commit-bot: I haz the power, 2013-11-18 11:54:53]

Failed to apply patch for
chrome/browser/sync_file_system/drive_backend/sync_engine.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/sync_file_system/drive_backend/sync_engine.cc
  Hunk #1 FAILED at 6.
  Hunk #2 FAILED at 26.
  Hunk #3 succeeded at 275 (offset 8 lines).
  2 out of 3 hunks FAILED -- saving rejects to file
chrome/browser/sync_file_system/drive_backend/sync_engine.cc.rej

Patch:       chrome/browser/sync_file_system/drive_backend/sync_engine.cc
Index: chrome/browser/sync_file_system/drive_backend/sync_engine.cc
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
7ba7f511509426453f7820837fe818d5ef6737ef..74c1b2ab7090b5f65537cc9358850c75a1ef94f7
100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
@@ -6,8 +6,9 @@
 
 #include "base/bind.h"
 #include "base/values.h"
-#include "chrome/browser/drive/drive_api_service.h"
 #include "chrome/browser/drive/drive_notification_manager.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_constants.h"
 #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h"
 #include
"chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h"
@@ -26,11 +27,13 @@ SyncEngine::SyncEngine(
     const base::FilePath& base_dir,
     base::SequencedTaskRunner* task_runner,
     scoped_ptr<drive::DriveServiceInterface> drive_service,
+    scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
     drive::DriveNotificationManager* notification_manager,
     ExtensionService* extension_service)
     : base_dir_(base_dir),
       task_runner_(task_runner),
       drive_service_(drive_service.Pass()),
+      drive_uploader_(drive_uploader.Pass()),
       notification_manager_(notification_manager),
       extension_service_(extension_service),
       remote_change_processor_(NULL),
@@ -267,6 +270,10 @@ drive::DriveServiceInterface* SyncEngine::GetDriveService()
{
   return drive_service_.get();
 }
 
+drive::DriveUploaderInterface* SyncEngine::GetDriveUploader() {
+  return drive_uploader_.get();
+}
+
 MetadataDatabase* SyncEngine::GetMetadataDatabase() {
   return metadata_database_.get();
 }

[commit-bot: I haz the power, 2013-11-18 12:25:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tzik@chromium.org/73613003/150001

[commit-bot: I haz the power, 2013-11-18 12:59:03]

Change committed as 235727