Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/chromeos/drive/sync/entry_update_performer.cc

Index: chrome/browser/chromeos/drive/sync/entry_update_performer.cc
diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
index 0f8e069bb941ba7f8467452a1f88d68078571611..c77f3db3051b76bd3f4b7504c9fef1bb69439e0e 100644
--- a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
@@ -323,7 +323,7 @@ void EntryUpdatePerformer::UpdateEntryAfterPrepare(
       // FinishUpdate() is responsible to resolve conflicts caused by this.
       scoped_ptr<base::ScopedClosureRunner> null_loader_lock;
 
-      DriveUploader::UploadNewFileOptions options;
+      UploadNewFileOptions options;
       options.modified_date = last_modified;
       options.last_viewed_by_me_date = last_accessed;
       options.properties = properties;
@@ -339,7 +339,7 @@ void EntryUpdatePerformer::UpdateEntryAfterPrepare(
                      base::Passed(&local_state),
                      base::Passed(&null_loader_lock)));
     } else {
-      DriveUploader::UploadExistingFileOptions options;
+      UploadExistingFileOptions options;
       options.title = local_state->entry.title();
       options.parent_resource_id = local_state->parent_entry.resource_id();
       options.modified_date = last_modified;
@@ -366,7 +366,7 @@ void EntryUpdatePerformer::UpdateEntryAfterPrepare(
     scoped_ptr<base::ScopedClosureRunner> loader_lock =
         loader_controller_->GetLock();
 
-    DriveServiceInterface::AddNewDirectoryOptions options;
+    AddNewDirectoryOptions options;
     options.modified_date = last_modified;
     options.last_viewed_by_me_date = last_accessed;
     options.properties = properties;