Remove gdata:: from gdata_file_system_proxy.cc and .h

chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc

 // 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.
 
 #include "chrome/browser/chromeos/gdata/gdata_file_system_proxy.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
 
 using base::MessageLoopProxy;
 using content::BrowserThread;
 using fileapi::FileSystemURL;
 using fileapi::FileSystemOperationInterface;
 using webkit_blob::ShareableFileReference;
 
+namespace gdata {
+
 namespace {
 
 const char kGDataRootDirectory[] = "drive";
 const char kFeedField[] = "feed";
 
 // Helper function that creates platform file on blocking IO thread pool.
 void OpenPlatformFileOnIOPool(const FilePath& local_path,
                                 int file_flags,
                                 base::PlatformFile* platform_file,
                                 base::PlatformFileError* open_error) {
@@ skipping 13 matching lines @@
     base::PlatformFileError* open_error) {
   callback.Run(*open_error, *platform_file, peer_handle);
 }
 
 // Helper function to run OpenFileCallback from
 // GDataFileSystemProxy::OpenFile().
 void OnGetFileByPathForOpen(
     const FileSystemOperationInterface::OpenFileCallback& callback,
     int file_flags,
     base::ProcessHandle peer_handle,
-    gdata::GDataFileError gdata_error,
+    GDataFileError gdata_error,
     const FilePath& local_path,
     const std::string& unused_mime_type,
-    gdata::GDataFileType file_type) {
+    GDataFileType file_type) {
   base::PlatformFileError error =
-      gdata::util::GDataFileErrorToPlatformError(gdata_error);
+      util::GDataFileErrorToPlatformError(gdata_error);
   if (error != base::PLATFORM_FILE_OK) {
     callback.Run(error, base::kInvalidPlatformFileValue, peer_handle);
     return;
   }
 
   base::PlatformFile* platform_file = new base::PlatformFile(
       base::kInvalidPlatformFileValue);
   base::PlatformFileError* open_error =
       new base::PlatformFileError(base::PLATFORM_FILE_ERROR_FAILED);
   BrowserThread::GetBlockingPool()->PostTaskAndReply(FROM_HERE,
       base::Bind(&OpenPlatformFileOnIOPool,
                  local_path,
                  file_flags,
                  platform_file,
                  open_error),
       base::Bind(&OnPlatformFileOpened,
                  callback,
                  peer_handle,
                  base::Owned(platform_file),
                  base::Owned(open_error)));
 
 }
 
 // Helper function to run SnapshotFileCallback from
 // GDataFileSystemProxy::CreateSnapshotFile().
 void CallSnapshotFileCallback(
     const FileSystemOperationInterface::SnapshotFileCallback& callback,
     const base::PlatformFileInfo& file_info,
-    gdata::GDataFileError gdata_error,
+    GDataFileError gdata_error,
     const FilePath& local_path,
     const std::string& unused_mime_type,
-    gdata::GDataFileType file_type) {
+    GDataFileType file_type) {
   scoped_refptr<ShareableFileReference> file_ref;
   base::PlatformFileError error =
-      gdata::util::GDataFileErrorToPlatformError(gdata_error);
+      util::GDataFileErrorToPlatformError(gdata_error);
 
   // If the file is a hosted document, a temporary JSON file is created to
   // represent the document. The JSON file is not cached and its lifetime
   // is managed by ShareableFileReference.
-  if (error == base::PLATFORM_FILE_OK && file_type == gdata::HOSTED_DOCUMENT) {
+  if (error == base::PLATFORM_FILE_OK && file_type == HOSTED_DOCUMENT) {
     file_ref = ShareableFileReference::GetOrCreate(
         local_path, ShareableFileReference::DELETE_ON_FINAL_RELEASE,
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
   }
 
   // When reading file, last modified time specified in file info will be
   // compared to the last modified time of the local version of the drive file.
   // Since those two values don't generally match (last modification time on the
   // drive server vs. last modification time of the local, downloaded file), so
   // we have to opt out from this check. We do this by unsetting last_modified
   // value in the file info passed to the CreateSnapshot caller.
   base::PlatformFileInfo final_file_info(file_info);
   final_file_info.last_modified = base::Time();
 
   callback.Run(error, final_file_info, local_path, file_ref);
 }
 
-void OnClose(const FilePath& local_path, gdata::GDataFileError error_code) {
+void OnClose(const FilePath& local_path, GDataFileError error_code) {
   DVLOG(1) << "Closed: " << local_path.AsUTF8Unsafe() << ": " << error_code;
 }
 
 void DoTruncateOnFileThread(
     const FilePath& local_cache_path,
     int64 length,
     base::PlatformFileError* result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::PlatformFile file = base::CreatePlatformFile(
       local_cache_path,
       base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_WRITE,
       NULL,
       result);
   if (*result == base::PLATFORM_FILE_OK) {
     DCHECK_NE(base::kInvalidPlatformFileValue, file);
     if (!base::TruncatePlatformFile(file, length))
       *result = base::PLATFORM_FILE_ERROR_FAILED;
     base::ClosePlatformFile(file);
   }
 }
 
 void DidCloseFileForTruncate(
     const FileSystemOperationInterface::StatusCallback& callback,
     base::PlatformFileError truncate_result,
-    gdata::GDataFileError close_result) {
+    GDataFileError close_result) {
   // Reports the first error.
   callback.Run(truncate_result == base::PLATFORM_FILE_OK ?
-               gdata::util::GDataFileErrorToPlatformError(close_result) :
+               util::GDataFileErrorToPlatformError(close_result) :
                truncate_result);
 }
 
 }  // namespace
 
-namespace gdata {
-
 base::FileUtilProxy::Entry GDataEntryProtoToFileUtilProxyEntry(
     const GDataEntryProto& proto) {
   base::PlatformFileInfo file_info;
   GDataEntry::ConvertProtoToPlatformFileInfo(proto.file_info(), &file_info);
 
   base::FileUtilProxy::Entry entry;
   entry.name = proto.base_name();
   entry.is_directory = file_info.is_directory;
   entry.size = file_info.size;
   entry.last_modified_time = file_info.last_modified;
@@ skipping 180 matching lines @@
 
 void GDataFileSystemProxy::OnOpenFileForWriting(
     int file_flags,
     base::ProcessHandle peer_handle,
     const FileSystemOperationInterface::OpenFileCallback& callback,
     GDataFileError gdata_error,
     const FilePath& local_cache_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   base::PlatformFileError error =
-      gdata::util::GDataFileErrorToPlatformError(gdata_error);
+      util::GDataFileErrorToPlatformError(gdata_error);
 
   if (error != base::PLATFORM_FILE_OK) {
     callback.Run(error, base::kInvalidPlatformFileValue, peer_handle);
     return;
   }
 
   // Cache file prepared for modification is available. Truncate it.
   // File operation must be done on FILE thread, so relay the operation.
   base::PlatformFileError* result =
       new base::PlatformFileError(base::PLATFORM_FILE_ERROR_FAILED);
@@ skipping 14 matching lines @@
 }
 
 void GDataFileSystemProxy::OnCreateFileForOpen(
     const FilePath& file_path,
     int file_flags,
     base::ProcessHandle peer_handle,
     const FileSystemOperationInterface::OpenFileCallback& callback,
     GDataFileError gdata_error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   base::PlatformFileError create_result =
-      gdata::util::GDataFileErrorToPlatformError(gdata_error);
+      util::GDataFileErrorToPlatformError(gdata_error);
 
   if ((create_result == base::PLATFORM_FILE_OK) ||
       ((create_result == base::PLATFORM_FILE_ERROR_EXISTS) &&
        (file_flags & base::PLATFORM_FILE_CREATE_ALWAYS))) {
     // If we are trying to always create an existing file, then
     // if it really exists open it as truncated.
     file_flags &= ~base::PLATFORM_FILE_CREATE;
     file_flags &= ~base::PLATFORM_FILE_CREATE_ALWAYS;
     file_flags |= base::PLATFORM_FILE_OPEN_TRUNCATED;
   } else {
@@ skipping 228 matching lines @@
   // what platform you're on.
   if (!url.is_valid() || url.type() != fileapi::kFileSystemTypeExternal) {
     return false;
   }
   *file_path = url.path();
   return true;
 }
 
 void GDataFileSystemProxy::OnStatusCallback(
     const fileapi::FileSystemOperationInterface::StatusCallback& callback,
-    gdata::GDataFileError error) {
+    GDataFileError error) {
   callback.Run(util::GDataFileErrorToPlatformError(error));
 }
 
 void GDataFileSystemProxy::OnGetMetadata(
     const FilePath& file_path,
     const FileSystemOperationInterface::GetMetadataCallback& callback,
     GDataFileError error,
-    scoped_ptr<gdata::GDataEntryProto> entry_proto) {
+    scoped_ptr<GDataEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (error != GDATA_FILE_OK) {
     callback.Run(util::GDataFileErrorToPlatformError(error),
                  base::PlatformFileInfo(),
                  FilePath());
     return;
   }
   DCHECK(entry_proto.get());
 
   base::PlatformFileInfo file_info;
   GDataEntry::ConvertProtoToPlatformFileInfo(
       entry_proto->file_info(),
       &file_info);
 
   callback.Run(base::PLATFORM_FILE_OK, file_info, file_path);
 }
 
 void GDataFileSystemProxy::OnReadDirectory(
     const FileSystemOperationInterface::ReadDirectoryCallback&
     callback,
     GDataFileError error,
     bool hide_hosted_documents,
-    scoped_ptr<gdata::GDataEntryProtoVector> proto_entries) {
+    scoped_ptr<GDataEntryProtoVector> proto_entries) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (error != GDATA_FILE_OK) {
     callback.Run(util::GDataFileErrorToPlatformError(error),
                  std::vector<base::FileUtilProxy::Entry>(),
                  false);
     return;
   }
   DCHECK(proto_entries.get());
 
@@ skipping 38 matching lines @@
 
 void GDataFileSystemProxy::CloseWritableSnapshotFile(
     const FilePath& virtual_path,
     const FilePath& local_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   file_system_->CloseFile(virtual_path, base::Bind(&OnClose, virtual_path));
 }
 
 }  // namespace gdata