Remove gdata:: from gdata_file_system_proxy.cc and .h

chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc

Index: chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc b/chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc
index d236d1f47cfb29f9c018193e099930d70744a4ef..825021b81dab8f970b890f645b279a78f3012598 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc
+++ b/chrome/browser/chromeos/gdata/gdata_file_system_proxy.cc
@@ -28,6 +28,8 @@ using fileapi::FileSystemURL;
 using fileapi::FileSystemOperationInterface;
 using webkit_blob::ShareableFileReference;
 
+namespace gdata {
+
 namespace {
 
 const char kGDataRootDirectory[] = "drive";
@@ -61,12 +63,12 @@ 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;
@@ -95,18 +97,18 @@ void OnGetFileByPathForOpen(
 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));
@@ -124,7 +126,7 @@ void CallSnapshotFileCallback(
   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;
 }
 
@@ -150,17 +152,15 @@ void DoTruncateOnFileThread(
 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;
@@ -361,7 +361,7 @@ void GDataFileSystemProxy::OnOpenFileForWriting(
   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);
@@ -396,7 +396,7 @@ void GDataFileSystemProxy::OnCreateFileForOpen(
     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) &&
@@ -645,7 +645,7 @@ bool GDataFileSystemProxy::ValidateUrl(
 
 void GDataFileSystemProxy::OnStatusCallback(
     const fileapi::FileSystemOperationInterface::StatusCallback& callback,
-    gdata::GDataFileError error) {
+    GDataFileError error) {
   callback.Run(util::GDataFileErrorToPlatformError(error));
 }
 
@@ -653,7 +653,7 @@ 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) {
@@ -677,7 +677,7 @@ void GDataFileSystemProxy::OnReadDirectory(
     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) {