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

webkit/tools/test_shell/simple_file_system.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/tools/test_shell/simple_file_system.h"
 
 #include "base/file_path.h"
 #include "base/message_loop_proxy.h"
 #include "base/time.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileInfo.h"
@@ skipping 55 matching lines @@
     WebFileInfo web_file_info;
     web_file_info.length = info.size;
     web_file_info.modificationTime = info.last_modified.ToDoubleT();
     web_file_info.type = info.is_directory ?
         WebFileInfo::TypeDirectory : WebFileInfo::TypeFile;
     callbacks_->didReadMetadata(web_file_info);
     file_system_->RemoveCompletedOperation(request_id_);
   }
 
   virtual void DidReadDirectory(
-      const std::vector<base::file_util_proxy::Entry>& entries,
+      const std::vector<base::FileUtilProxy::Entry>& entries,
       bool has_more) {
     std::vector<WebFileSystemEntry> web_entries_vector;
-    for (std::vector<base::file_util_proxy::Entry>::const_iterator it =
+    for (std::vector<base::FileUtilProxy::Entry>::const_iterator it =
              entries.begin(); it != entries.end(); ++it) {
       WebFileSystemEntry entry;
       entry.name = webkit_glue::FilePathStringToWebString(it->name);
       entry.isDirectory = it->is_directory;
       web_entries_vector.push_back(entry);
     }
     WebVector<WebKit::WebFileSystemEntry> web_entries =
         web_entries_vector;
     callbacks_->didReadDirectory(web_entries, has_more);
     file_system_->RemoveCompletedOperation(request_id_);
@@ skipping 114 matching lines @@
   fileapi::FileSystemOperation* operation = new fileapi::FileSystemOperation(
       dispatcher, base::MessageLoopProxy::CreateForCurrentThread());
   int32 request_id = operations_.Add(operation);
   dispatcher->set_request_id(request_id);
   return operation;
 }
 
 void SimpleFileSystem::RemoveCompletedOperation(int request_id) {
   operations_.Remove(request_id);
 }