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

webkit/fileapi/file_system_directory_database.h

 // 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.
 
-#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"
 
 namespace leveldb {
 class WriteBatch;
 }
 
 namespace fileapi {
 
 // This class WILL NOT protect you against producing directory loops, giving an
@@ skipping 21 matching lines @@
 
     FileId parent_id;
     FilePath data_path;
     FilePath::StringType name;
     // This modification time is valid only for directories, not files, as
     // FileWriter will get the files out of sync.
     // For files, look at the modification time of the underlying data_path.
     base::Time modification_time;
   };
 
-  FileSystemDirectoryDatabase(const FilePath& path);
+  explicit FileSystemDirectoryDatabase(const FilePath& path);
   ~FileSystemDirectoryDatabase();
 
   bool GetChildWithName(
       FileId parent_id, const FilePath::StringType& name, FileId* child_id);
   bool GetFileWithPath(const FilePath& path, FileId* file_id);
   // ListChildren will succeed, returning 0 children, if parent_id doesn't
   // exist.
   bool ListChildren(FileId parent_id, std::vector<FileId>* children);
   bool GetFileInfo(FileId file_id, FileInfo* info);
   bool AddFileInfo(const FileInfo& info, FileId* file_id);
@@ skipping 26 matching lines @@
       const FileInfo& info, FileId file_id, leveldb::WriteBatch* batch);
   bool RemoveFileInfoHelper(FileId file_id, leveldb::WriteBatch* batch);
   void HandleError(leveldb::Status status);
 
   std::string path_;
   scoped_ptr<leveldb::DB> db_;
 };
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H
+#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_