Reapply 61613 that was reverted for false valgrind alarm.

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 115 matching lines @@
   FilePath dest_filepath(webkit_glue::WebStringToFilePath(dest_path));
   FilePath src_filepath(webkit_glue::WebStringToFilePath(src_path));
 
   GetNewOperation(callbacks)->Copy(src_filepath, dest_filepath);
 }
 
 void SimpleFileSystem::remove(
     const WebString& path, WebFileSystemCallbacks* callbacks) {
   FilePath filepath(webkit_glue::WebStringToFilePath(path));
 
-  GetNewOperation(callbacks)->Remove(filepath);
+  GetNewOperation(callbacks)->Remove(filepath, false /* recursive */);
+}
+
+void SimpleFileSystem::removeRecursively(
+    const WebString& path, WebFileSystemCallbacks* callbacks) {
+  FilePath filepath(webkit_glue::WebStringToFilePath(path));
+
+  GetNewOperation(callbacks)->Remove(filepath, true /* recursive */);
 }
 
 void SimpleFileSystem::readMetadata(
     const WebString& path, WebFileSystemCallbacks* callbacks) {
   FilePath filepath(webkit_glue::WebStringToFilePath(path));
 
   GetNewOperation(callbacks)->GetMetadata(filepath);
 }
 
 void SimpleFileSystem::createFile(
@@ skipping 39 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);
 }