Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/drive/drive_service_interface.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_SERVICE_INTERFACE_H_
 #define CHROME_BROWSER_DRIVE_DRIVE_SERVICE_INTERFACE_H_
 
 #include <string>
 
 #include "base/time/time.h"
@@ skipping 14 matching lines @@
   // Triggered when the service gets ready to send requests.
   virtual void OnReadyToSendRequests() {}
 
   // Called when the refresh token was found to be invalid.
   virtual void OnRefreshTokenInvalid() {}
 
  protected:
   virtual ~DriveServiceObserver() {}
 };
 
+// Optional parameters for AddNewDirectory().
+struct AddNewDirectoryOptions {
+  AddNewDirectoryOptions();
+  ~AddNewDirectoryOptions();
+
+  // modified_date of the directory.
+  // Pass the null Time if you are not interested in setting this property.
+  base::Time modified_date;
+
+  // last_viewed_by_me_date of the directory.
+  // Pass the null Time if you are not interested in setting this property.
+  base::Time last_viewed_by_me_date;
+
+  // List of properties for a new directory.
+  google_apis::drive::Properties properties;
+};
+
+// Optional parameters for InitiateUploadNewFile() and
+// MultipartUploadNewFile().
+struct UploadNewFileOptions {
+  UploadNewFileOptions();
+  ~UploadNewFileOptions();
+
+  // modified_date of the file.
+  // Pass the null Time if you are not interested in setting this property.
+  base::Time modified_date;
+
+  // last_viewed_by_me_date of the file.
+  // Pass the null Time if you are not interested in setting this property.
+  base::Time last_viewed_by_me_date;
+
+  // List of properties for a new file.
+  google_apis::drive::Properties properties;
+};
+
+// Optional parameters for InitiateUploadExistingFile() and
+// MultipartUploadExistingFile().
+struct UploadExistingFileOptions {
+  UploadExistingFileOptions();
+  ~UploadExistingFileOptions();
+
+  // Expected ETag of the file. UPLOAD_ERROR_CONFLICT error is generated when
+  // matching fails.
+  // Pass the empty string to disable this behavior.
+  std::string etag;
+
+  // New parent of the file.
+  // Pass the empty string to keep the property unchanged.
+  std::string parent_resource_id;
+
+  // New title of the file.
+  // Pass the empty string to keep the property unchanged.
+  std::string title;
+
+  // New modified_date of the file.
+  // Pass the null Time if you are not interested in setting this property.
+  base::Time modified_date;
+
+  // New last_viewed_by_me_date of the file.
+  // Pass the null Time if you are not interested in setting this property.
+  base::Time last_viewed_by_me_date;
+
+  // List of new properties for an existing file (it will be merged with
+  // existing properties).
+  google_apis::drive::Properties properties;
+};
+
 // This defines an interface for sharing by DriveService and MockDriveService
 // so that we can do testing of clients of DriveService.
 //
 // All functions must be called on UI thread. DriveService is built on top of
 // URLFetcher that runs on UI thread.
 class DriveServiceInterface {
  public:
-  // Optional parameters for AddNewDirectory().
-  struct AddNewDirectoryOptions {
-    AddNewDirectoryOptions();
-    ~AddNewDirectoryOptions();
-
-    // modified_date of the directory.
-    // Pass the null Time if you are not interested in setting this property.
-    base::Time modified_date;
-
-    // last_viewed_by_me_date of the directory.
-    // Pass the null Time if you are not interested in setting this property.
-    base::Time last_viewed_by_me_date;
-
-    // List of properties for a new directory.
-    google_apis::drive::Properties properties;
-  };
-
-  // Optional parameters for InitiateUploadNewFile() and
-  // MultipartUploadNewFile().
-  struct UploadNewFileOptions {
-    UploadNewFileOptions();
-    ~UploadNewFileOptions();
-
-    // modified_date of the file.
-    // Pass the null Time if you are not interested in setting this property.
-    base::Time modified_date;
-
-    // last_viewed_by_me_date of the file.
-    // Pass the null Time if you are not interested in setting this property.
-    base::Time last_viewed_by_me_date;
-
-    // List of properties for a new file.
-    google_apis::drive::Properties properties;
-  };
-
-  // Optional parameters for InitiateUploadExistingFile() and
-  // MultipartUploadExistingFile().
-  struct UploadExistingFileOptions {
-    UploadExistingFileOptions();
-    ~UploadExistingFileOptions();
-
-    // Expected ETag of the file. UPLOAD_ERROR_CONFLICT error is generated when
-    // matching fails.
-    // Pass the empty string to disable this behavior.
-    std::string etag;
-
-    // New parent of the file.
-    // Pass the empty string to keep the property unchanged.
-    std::string parent_resource_id;
-
-    // New title of the file.
-    // Pass the empty string to keep the property unchanged.
-    std::string title;
-
-    // New modified_date of the file.
-    // Pass the null Time if you are not interested in setting this property.
-    base::Time modified_date;
-
-    // New last_viewed_by_me_date of the file.
-    // Pass the null Time if you are not interested in setting this property.
-    base::Time last_viewed_by_me_date;
-
-    // List of new properties for an existing file (it will be merged with
-    // existing properties).
-    google_apis::drive::Properties properties;
-  };
-
   virtual ~DriveServiceInterface() {}
 
   // Common service:
 
   // Initializes the documents service with |account_id|.
   virtual void Initialize(const std::string& account_id) = 0;
 
   // Adds an observer.
   virtual void AddObserver(DriveServiceObserver* observer) = 0;
 
@@ skipping 320 matching lines @@
   virtual google_apis::CancelCallback AddPermission(
       const std::string& resource_id,
       const std::string& email,
       google_apis::drive::PermissionRole role,
       const google_apis::EntryActionCallback& callback) = 0;
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_DRIVE_DRIVE_SERVICE_INTERFACE_H_