Moving Entry from base::file_util_proxy namespace to within class base::FileU...

webkit/fileapi/file_system_operation_unittest.cc

 // Copyright (c) 2010 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 "webkit/fileapi/file_system_operation.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 27 matching lines @@
   virtual void DidSucceed() {
     status_ = kFileOperationSucceeded;
   }
 
   virtual void DidReadMetadata(const base::PlatformFileInfo& info) {
     info_ = info;
     status_ = kFileOperationSucceeded;
   }
 
   virtual void DidReadDirectory(
-      const std::vector<base::file_util_proxy::Entry>& entries,
+      const std::vector<base::FileUtilProxy::Entry>& entries,
       bool /* has_more */) {
     entries_ = entries;
   }
 
   virtual void DidOpenFileSystem(const std::string&, const FilePath&) {
     NOTREACHED();
   }
 
   virtual void DidWrite(int64 bytes, bool complete) {
     NOTREACHED();
   }
 
   // Helpers for testing.
   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_;
   }
 
  private:
   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 {
  public:
   FileSystemOperationTest()
       : request_id_(kInvalidRequestId),
         operation_(NULL) {
     base_.CreateUniqueTempDir();
     EXPECT_TRUE(base_.IsValid());
   }
@@ skipping 697 matching lines @@
 
   // Check that its length is now 3 and that it contains only bits of test data.
   EXPECT_TRUE(file_util::GetFileInfo(file, &info));
   EXPECT_EQ(length, info.size);
   EXPECT_EQ(length, file_util::ReadFile(file, data, length));
   for (int i = 0; i < length; ++i)
     EXPECT_EQ(test_data[i], data[i]);
 }
 
 }  // namespace fileapi