Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2)

webkit/fileapi/file_system_file_util.cc

 // Copyright (c) 2011 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_file_util.h"
 
 #include <stack>
+#include <vector>
 
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 
 namespace fileapi {
 
 namespace {
 
 // This assumes that the root exists.
 bool ParentExists(FileSystemOperationContext* context,
     FileSystemFileUtil* file_util, const FilePath& file_path) {
   // If file_path is in the root, file_path.DirName() will be ".",
   // since we use paths with no leading '/'.
   FilePath parent = file_path.DirName();
   if (parent == FilePath(FILE_PATH_LITERAL(".")))
     return true;
   return file_util->DirectoryExists(context, parent);
 }
 
-}
+}  // namespace
 
 // static
 FileSystemFileUtil* FileSystemFileUtil::GetInstance() {
   return Singleton<FileSystemFileUtil>::get();
 }
 
 PlatformFileError FileSystemFileUtil::CreateOrOpen(
     FileSystemOperationContext* unused,
     const FilePath& file_path, int file_flags,
     PlatformFile* file_handle, bool* created) {
@@ skipping 158 matching lines @@
 
 PlatformFileError FileSystemFileUtil::Delete(
     FileSystemOperationContext* context,
     const FilePath& file_path,
     bool recursive) {
   if (DirectoryExists(context, file_path)) {
     if (!recursive)
       return DeleteSingleDirectory(context, file_path);
     else
       return DeleteDirectoryRecursive(context, file_path);
-  } else
+  } else {
     return DeleteFile(context, file_path);
+  }
 }
 
 PlatformFileError FileSystemFileUtil::Touch(
     FileSystemOperationContext* unused,
     const FilePath& file_path,
     const base::Time& last_access_time,
     const base::Time& last_modified_time) {
   if (!file_util::TouchFile(
           file_path, last_access_time, last_modified_time))
     return base::PLATFORM_FILE_ERROR_FAILED;
@@ skipping 321 matching lines @@
 FileSystemFileUtil::CreateFileEnumerator(
     FileSystemOperationContext* unused,
     const FilePath& root_path) {
   return new FileSystemFileEnumerator(
       root_path, true, static_cast<file_util::FileEnumerator::FILE_TYPE>(
       file_util::FileEnumerator::FILES |
       file_util::FileEnumerator::DIRECTORIES));
 }
 
 }  // namespace fileapi