Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/drive/drive_uploader.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_
 #define CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 23 matching lines @@
 // terminated before the completion due to some errors. It can be used to
 // resume it.
 typedef base::Callback<void(
     google_apis::DriveApiErrorCode error,
     const GURL& upload_location,
     scoped_ptr<google_apis::FileResource> resource_entry)>
     UploadCompletionCallback;
 
 class DriveUploaderInterface {
  public:
-  typedef DriveServiceInterface::UploadNewFileOptions UploadNewFileOptions;
-  typedef DriveServiceInterface::UploadExistingFileOptions
-      UploadExistingFileOptions;
-
   virtual ~DriveUploaderInterface() {}
 
   // Uploads a new file to a directory specified by |upload_location|.
   // Returns a callback for cancelling the uploading job.
   //
   // parent_resource_id:
   //   resource id of the destination directory.
   //
   // local_file_path:
   //   The path to the local file to be uploaded.
@@ skipping 156 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<DriveUploader> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(DriveUploader);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_