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

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7149008

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

3 files changed, 12 insertions, 10 deletions

diff --git a/webkit/fileapi/file_system_directory_database.h b/webkit/fileapi/file_system_directory_database.h
index 0c36463..2735b9d 100644
--- a/webkit/fileapi/file_system_directory_database.h
+++ b/webkit/fileapi/file_system_directory_database.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H
-#define WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H
+#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_
+#define WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "third_party/leveldb/include/leveldb/db.h"
 
@@ -51,7 +51,7 @@ class FileSystemDirectoryDatabase {
     base::Time modification_time;
   };
 
-  FileSystemDirectoryDatabase(const FilePath& path);
+  explicit FileSystemDirectoryDatabase(const FilePath& path);
   ~FileSystemDirectoryDatabase();
 
   bool GetChildWithName(
@@ -98,4 +98,4 @@ class FileSystemDirectoryDatabase {
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H
+#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_
diff --git a/webkit/fileapi/file_system_file_util.cc b/webkit/fileapi/file_system_file_util.cc
index 5e5e973..fbd273e 100644
--- a/webkit/fileapi/file_system_file_util.cc
+++ b/webkit/fileapi/file_system_file_util.cc
@@ -5,10 +5,11 @@
 #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 {
@@ -26,7 +27,7 @@ bool ParentExists(FileSystemOperationContext* context,
   return file_util->DirectoryExists(context, parent);
 }
 
-}
+}  // namespace
 
 // static
 FileSystemFileUtil* FileSystemFileUtil::GetInstance() {
@@ -205,8 +206,9 @@ PlatformFileError FileSystemFileUtil::Delete(
       return DeleteSingleDirectory(context, file_path);
     else
       return DeleteDirectoryRecursive(context, file_path);
-  } else
+  } else {
     return DeleteFile(context, file_path);
+  }
 }
 
 PlatformFileError FileSystemFileUtil::Touch(
diff --git a/webkit/fileapi/file_system_origin_database.h b/webkit/fileapi/file_system_origin_database.h
index 885d165..63a4b815 100644
--- a/webkit/fileapi/file_system_origin_database.h
+++ b/webkit/fileapi/file_system_origin_database.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/file_path.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "third_party/leveldb/include/leveldb/db.h"
 
 namespace fileapi {
@@ -30,7 +30,7 @@ class FileSystemOriginDatabase {
 
   // Only one instance of FileSystemOriginDatabase should exist for a given path
   // at a given time.
-  FileSystemOriginDatabase(const FilePath& path);
+  explicit FileSystemOriginDatabase(const FilePath& path);
   ~FileSystemOriginDatabase();
 
   bool HasOriginPath(const std::string& origin);