drive: Rename 'gdata' namespace to 'drive' in chrome/browser/chromeos/drive

chrome/browser/chromeos/drive/drive_file_system_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_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_INTERFACE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_INTERFACE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
 #include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_operations.h"
 
 namespace gdata {
+class DocumentEntry;
+}
 
-class DocumentEntry;
+namespace drive {
+
 class DriveEntryProto;
 class DriveFileSystemObserver;
 
 typedef std::vector<DriveEntryProto> DriveEntryProtoVector;
 
 // Information about search result returned by Search Async callback.
 // This is data needed to create a file system entry that will be used by file
 // browser.
 struct SearchResultInfo {
   SearchResultInfo(const FilePath& in_path, bool in_is_directory)
@@ skipping 206 matching lines @@
   // system in order to be retrieved. If the file is not cached, the file
   // will be downloaded through GData API or Drive V2 API.
   //
   // Can be called from UI/IO thread. |get_file_callback| and
   // |get_content_callback| are run on the calling thread.
   // |get_file_callback| must not be null.
   // |get_content_callback| may be null.
   virtual void GetFileByPath(
       const FilePath& file_path,
       const GetFileCallback& get_file_callback,
-      const GetContentCallback& get_content_callback) = 0;
+      const gdata::GetContentCallback& get_content_callback) = 0;
 
   // Gets a file by the given |resource_id| from the Drive server. Used for
   // fetching pinned-but-not-fetched files.
   //
   // Can be called from UI/IO thread. |get_file_callback| and
   // |get_content_callback| are run on the calling thread.
   // |get_file_callback| must not be null.
   // |get_content_callback| may be null.
   virtual void GetFileByResourceId(
       const std::string& resource_id,
       const GetFileCallback& get_file_callback,
-      const GetContentCallback& get_content_callback) = 0;
+      const gdata::GetContentCallback& get_content_callback) = 0;
 
   // Updates a file by the given |resource_id| on the Drive server by
   // uploading an updated version. Used for uploading dirty files. The file
   // should already be present in the cache.
   //
   // TODO(satorux): As of now, the function only handles files with the dirty
   // bit committed. We should eliminate the restriction. crbug.com/134558.
   //
   // Can be called from UI/IO thread. |callback| and is run on the calling
   // thread.  |callback| must not be null.
@@ skipping 52 matching lines @@
   // Adds a file entry from |doc_entry| under |directory_path|, and modifies
   // the cache state.
   //
   // When uploading a new file, adds a new file entry, and store its content
   // from |file_content_path| into the cache.
   //
   // When uploading an existing file, replaces the file entry with a new one,
   // and clears the dirty bit in the cache.
   //
   // |callback| will be called on the UI thread upon completion of operation.
-  virtual void AddUploadedFile(UploadMode upload_mode,
+  virtual void AddUploadedFile(gdata::UploadMode upload_mode,
                                const FilePath& directory_path,
-                               scoped_ptr<DocumentEntry> doc_entry,
+                               scoped_ptr<gdata::DocumentEntry> doc_entry,
                                const FilePath& file_content_path,
                                DriveCache::FileOperationType cache_operation,
                                const base::Closure& callback) = 0;
 
   // Updates the data associated with the file referenced by |resource_id| and
   // |md5|.  The data is copied from |file_content_path|.
   //
   // |callback| will be called on the UI thread upon completion of operation.
   virtual void UpdateEntryData(const std::string& resource_id,
                                const std::string& md5,
-                               scoped_ptr<DocumentEntry> entry,
+                               scoped_ptr<gdata::DocumentEntry> entry,
                                const FilePath& file_content_path,
                                const base::Closure& callback) = 0;
 };
 
-}  // namespace gdata
+}  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_INTERFACE_H_