Moving Entry from base::file_util_proxy namespace to within class base::FileUtilProxy

BUG=None
TEST=None


Review URL: http://codereview.chromium.org/4261001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64806 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 12 insertions, 10 deletions

diff --git a/webkit/fileapi/file_system_callback_dispatcher.h b/webkit/fileapi/file_system_callback_dispatcher.h
index ea7c442..0b4c25b 100644
--- a/webkit/fileapi/file_system_callback_dispatcher.h
+++ b/webkit/fileapi/file_system_callback_dispatcher.h
@@ -33,7 +33,7 @@ class FileSystemCallbackDispatcher {
   // all contents (the subsets reported in any two calls are disjoint), and
   // |has_more| will be true, except for the last chunk.
   virtual void DidReadDirectory(
-      const std::vector<base::file_util_proxy::Entry>& entries,
+      const std::vector<base::FileUtilProxy::Entry>& entries,
       bool has_more) = 0;
 
   // Callback for opening a file system. Called with a name and root path for
@@ -48,6 +48,6 @@ class FileSystemCallbackDispatcher {
   virtual void DidWrite(int64 bytes, bool complete) = 0;
 };
 
-} // namespace fileapi
+}  // namespace fileapi
 
-#endif  //  WEBKIT_FILEAPI_FILE_SYSTEM_CALLBACK_DISPATCHER_H_
+#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_CALLBACK_DISPATCHER_H_
diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index 0e2e823..fe07758 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -256,8 +256,9 @@ void FileSystemOperation::DidDirectoryExists(
       dispatcher_->DidSucceed();
     else
       dispatcher_->DidFail(base::PLATFORM_FILE_ERROR_FAILED);
-  } else
+  } else {
     dispatcher_->DidFail(rv);
+  }
 }
 
 void FileSystemOperation::DidFileExists(
@@ -268,8 +269,9 @@ void FileSystemOperation::DidFileExists(
       dispatcher_->DidFail(base::PLATFORM_FILE_ERROR_FAILED);
     else
       dispatcher_->DidSucceed();
-  } else
+  } else {
     dispatcher_->DidFail(rv);
+  }
 }
 
 void FileSystemOperation::DidGetMetadata(
@@ -283,7 +285,7 @@ void FileSystemOperation::DidGetMetadata(
 
 void FileSystemOperation::DidReadDirectory(
     base::PlatformFileError rv,
-    const std::vector<base::file_util_proxy::Entry>& entries) {
+    const std::vector<base::FileUtilProxy::Entry>& entries) {
   if (rv == base::PLATFORM_FILE_OK)
     dispatcher_->DidReadDirectory(entries, false /* has_more */);
   else
diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h
index 6b4599a..d76513f 100644
--- a/webkit/fileapi/file_system_operation.h
+++ b/webkit/fileapi/file_system_operation.h
@@ -104,7 +104,7 @@ class FileSystemOperation {
 
   void DidReadDirectory(
       base::PlatformFileError rv,
-      const std::vector<base::file_util_proxy::Entry>& entries);
+      const std::vector<base::FileUtilProxy::Entry>& entries);
 
   void DidWrite(
       base::PlatformFileError rv,
diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc
index fb300bf..370d95c 100644
--- a/webkit/fileapi/file_system_operation_unittest.cc
+++ b/webkit/fileapi/file_system_operation_unittest.cc
@@ -45,7 +45,7 @@ class MockDispatcher : public FileSystemCallbackDispatcher {
   }
 
   virtual void DidReadDirectory(
-      const std::vector<base::file_util_proxy::Entry>& entries,
+      const std::vector<base::FileUtilProxy::Entry>& entries,
       bool /* has_more */) {
     entries_ = entries;
   }
@@ -62,7 +62,7 @@ class MockDispatcher : public FileSystemCallbackDispatcher {
   int status() const { return status_; }
   int request_id() const { return request_id_; }
   const base::PlatformFileInfo& info() const { return info_; }
-  const std::vector<base::file_util_proxy::Entry>& entries() const {
+  const std::vector<base::FileUtilProxy::Entry>& entries() const {
     return entries_;
   }
 
@@ -70,7 +70,7 @@ class MockDispatcher : public FileSystemCallbackDispatcher {
   int status_;
   int request_id_;
   base::PlatformFileInfo info_;
-  std::vector<base::file_util_proxy::Entry> entries_;
+  std::vector<base::FileUtilProxy::Entry> entries_;
 };
 
 class FileSystemOperationTest : public testing::Test {