Style fix in webkit/fileapi

BUG=
TEST='cpplint.py will claim less error.'


Review URL: http://codereview.chromium.org/9965138

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

37 files changed, 83 insertions, 60 deletions

diff --git a/webkit/fileapi/file_system_callback_dispatcher.h b/webkit/fileapi/file_system_callback_dispatcher.h
index cf19d00..9d18f9d 100644
--- a/webkit/fileapi/file_system_callback_dispatcher.h
+++ b/webkit/fileapi/file_system_callback_dispatcher.h
@@ -1,10 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_CALLBACK_DISPATCHER_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_CALLBACK_DISPATCHER_H_
 
+#include <string>
 #include <vector>
 
 #include "base/file_util_proxy.h"
diff --git a/webkit/fileapi/file_system_context.cc b/webkit/fileapi/file_system_context.cc
index 07acff2..a700221 100644
--- a/webkit/fileapi/file_system_context.cc
+++ b/webkit/fileapi/file_system_context.cc
@@ -145,7 +145,7 @@ FileSystemContext::external_provider() const {
 }
 
 void FileSystemContext::DeleteOnCorrectThread() const {
-  if (!io_message_loop_->BelongsToCurrentThread() && 
+  if (!io_message_loop_->BelongsToCurrentThread() &&
       io_message_loop_->DeleteSoon(FROM_HERE, this)) {
     return;
   }
diff --git a/webkit/fileapi/file_system_context.h b/webkit/fileapi/file_system_context.h
index 7824e9d..35e043d 100644
--- a/webkit/fileapi/file_system_context.h
+++ b/webkit/fileapi/file_system_context.h
@@ -5,6 +5,8 @@
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_CONTEXT_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_CONTEXT_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/webkit/fileapi/file_system_dir_url_request_job.cc b/webkit/fileapi/file_system_dir_url_request_job.cc
index 9b9bcfd..af0a934 100644
--- a/webkit/fileapi/file_system_dir_url_request_job.cc
+++ b/webkit/fileapi/file_system_dir_url_request_job.cc
@@ -52,7 +52,6 @@ FileSystemDirURLRequestJob::~FileSystemDirURLRequestJob() {
 
 bool FileSystemDirURLRequestJob::ReadRawData(net::IOBuffer* dest, int dest_size,
                                              int *bytes_read) {
-
   int count = std::min(dest_size, static_cast<int>(data_.size()));
   if (count > 0) {
     memcpy(dest->data(), data_.data(), count);
diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
index d124e7e..8c04d0e 100644
--- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
@@ -10,8 +10,6 @@
 
 #include "webkit/fileapi/file_system_dir_url_request_job.h"
 
-#include "build/build_config.h"
-
 #include <string>
 
 #include "base/file_path.h"
diff --git a/webkit/fileapi/file_system_directory_database.cc b/webkit/fileapi/file_system_directory_database.cc
index c25e006..b5c92ab 100644
--- a/webkit/fileapi/file_system_directory_database.cc
+++ b/webkit/fileapi/file_system_directory_database.cc
@@ -53,7 +53,6 @@ bool FileInfoFromPickle(
       pickle.ReadString(&iter, &data_path) &&
       pickle.ReadString(&iter, &name) &&
       pickle.ReadInt64(&iter, &internal_time)) {
-
     info->data_path = fileapi::StringToFilePath(data_path);
     info->name = fileapi::StringToFilePath(name).value();
     info->modification_time = base::Time::FromInternalValue(internal_time);
diff --git a/webkit/fileapi/file_system_file_util_proxy.h b/webkit/fileapi/file_system_file_util_proxy.h
index fad1f3b..c651565 100644
--- a/webkit/fileapi/file_system_file_util_proxy.h
+++ b/webkit/fileapi/file_system_file_util_proxy.h
@@ -41,12 +41,11 @@ class FileSystemFileUtilProxy {
 
   typedef base::Callback<void(PlatformFileError status)> StatusCallback;
   typedef base::Callback<void(PlatformFileError status,
-                              bool created
-                              )> EnsureFileExistsCallback;
+                              bool created)> EnsureFileExistsCallback;
   typedef base::Callback<void(PlatformFileError status,
                               const PlatformFileInfo& info,
-                              const FilePath& platform_path
-                              )> GetFileInfoCallback;
+                              const FilePath& platform_path)>
+      GetFileInfoCallback;
   typedef base::Callback<void(PlatformFileError,
                               const std::vector<Entry>&,
                               bool has_more)> ReadDirectoryCallback;
diff --git a/webkit/fileapi/file_system_file_util_unittest.cc b/webkit/fileapi/file_system_file_util_unittest.cc
index 707ea71..68e5912 100644
--- a/webkit/fileapi/file_system_file_util_unittest.cc
+++ b/webkit/fileapi/file_system_file_util_unittest.cc
@@ -88,7 +88,7 @@ class FileSystemFileUtilTest : public testing::Test {
     // Do the actual copy or move.
     scoped_ptr<FileSystemOperationContext> copy_context(
         src_helper.NewOperationContext());
-    copy_context->set_allowed_bytes_growth(1024 * 1024); // OFSFU path quota.
+    copy_context->set_allowed_bytes_growth(1024 * 1024);  // OFSFU path quota.
 
     if (copy) {
       ASSERT_EQ(
diff --git a/webkit/fileapi/file_system_mount_point_provider.h b/webkit/fileapi/file_system_mount_point_provider.h
index ac74cb5..fa8ca13 100644
--- a/webkit/fileapi/file_system_mount_point_provider.h
+++ b/webkit/fileapi/file_system_mount_point_provider.h
@@ -12,7 +12,6 @@
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
-#include "base/platform_file.h"
 #include "webkit/fileapi/file_system_types.h"
 
 class GURL;
diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
index 2857c53..f56ce8c 100644
--- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc
+++ b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
@@ -102,7 +102,6 @@ const struct IsRestrictedNameTest {
   FilePath::StringType name;
   bool expected_dangerous;
 } kIsRestrictedNameTestCases[] = {
-
   // Names that contain strings that used to be restricted, but are now allowed.
   { FILE_PATH_LITERAL("con"), false, },
   { FILE_PATH_LITERAL("Con.txt"), false, },
diff --git a/webkit/fileapi/file_system_operation_context.h b/webkit/fileapi/file_system_operation_context.h
index 8901cb1..77298bf 100644
--- a/webkit/fileapi/file_system_operation_context.h
+++ b/webkit/fileapi/file_system_operation_context.h
@@ -17,7 +17,7 @@ class FileSystemContext;
 
 class FileSystemOperationContext {
  public:
-  FileSystemOperationContext(FileSystemContext* context);
+  explicit FileSystemOperationContext(FileSystemContext* context);
   ~FileSystemOperationContext();
 
   FileSystemContext* file_system_context() const {
diff --git a/webkit/fileapi/file_system_operation_interface.h b/webkit/fileapi/file_system_operation_interface.h
index 3bb785c..0583b94 100644
--- a/webkit/fileapi/file_system_operation_interface.h
+++ b/webkit/fileapi/file_system_operation_interface.h
@@ -5,6 +5,8 @@
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_INTERFACE_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_INTERFACE_H_
 
+#include <vector>
+
 #include "base/file_util_proxy.h"
 #include "base/platform_file.h"
 #include "base/process.h"
@@ -60,24 +62,24 @@ class FileSystemOperationInterface {
   // Used for GetMetadata(). |result| is the return code of the operation,
   // |file_info| is the obtained file info, and |platform_path| is the path
   // of the file.
-  typedef base::Callback<void(
-      base::PlatformFileError result,
-      const base::PlatformFileInfo& file_info,
-      const FilePath& platform_path)> GetMetadataCallback;
+  typedef base::Callback<
+      void(base::PlatformFileError result,
+           const base::PlatformFileInfo& file_info,
+           const FilePath& platform_path)> GetMetadataCallback;
 
   // Used for OpenFile(). |result| is the return code of the operation.
-  typedef base::Callback<void(
-      base::PlatformFileError result,
-      base::PlatformFile file,
-      base::ProcessHandle peer_handle)> OpenFileCallback;
+  typedef base::Callback<
+      void(base::PlatformFileError result,
+           base::PlatformFile file,
+           base::ProcessHandle peer_handle)> OpenFileCallback;
 
   // Used for ReadDirectory(). |result| is the return code of the operation,
   // |file_list| is the list of files read, and |has_more| is true if some files
   // are yet to be read.
-  typedef base::Callback<void(
-      base::PlatformFileError result,
-      const std::vector<base::FileUtilProxy::Entry>& file_list,
-      bool has_more)> ReadDirectoryCallback;
+  typedef base::Callback<
+      void(base::PlatformFileError result,
+           const std::vector<base::FileUtilProxy::Entry>& file_list,
+           bool has_more)> ReadDirectoryCallback;
 
   // Used for CreateSnapshotFile(). (Please see the comment at
   // CreateSnapshotFile() below for how the method is called)
@@ -100,12 +102,12 @@ class FileSystemOperationInterface {
   // longer necessary in the javascript world.
   // Please see the comment for ShareableFileReference for details.
   //
-  typedef base::Callback<void(
-      base::PlatformFileError result,
-      const base::PlatformFileInfo& file_info,
-      const FilePath& platform_path,
-      const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref
-      )> SnapshotFileCallback;
+  typedef base::Callback<
+      void(base::PlatformFileError result,
+           const base::PlatformFileInfo& file_info,
+           const FilePath& platform_path,
+           const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref)>
+          SnapshotFileCallback;
 
   // Used for Write().
   typedef base::Callback<void(base::PlatformFileError result,
diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc
index 9a3bff8..e37f91e 100644
--- a/webkit/fileapi/file_system_operation_unittest.cc
+++ b/webkit/fileapi/file_system_operation_unittest.cc
@@ -17,7 +17,6 @@
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
-#include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_test_helper.h"
 #include "webkit/fileapi/file_system_util.h"
@@ -1019,7 +1018,7 @@ TEST_F(FileSystemOperationTest, TestTouchFile) {
 
   const base::Time new_modified_time = base::Time::UnixEpoch();
   const base::Time new_accessed_time = new_modified_time +
-    base::TimeDelta::FromHours(77);;
+      base::TimeDelta::FromHours(77);
   ASSERT_NE(last_modified, new_modified_time);
   ASSERT_NE(last_accessed, new_accessed_time);
 
diff --git a/webkit/fileapi/file_system_operation_write_unittest.cc b/webkit/fileapi/file_system_operation_write_unittest.cc
index 7f4917d..cf26cbc 100644
--- a/webkit/fileapi/file_system_operation_write_unittest.cc
+++ b/webkit/fileapi/file_system_operation_write_unittest.cc
@@ -13,7 +13,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
-#include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/scoped_temp_dir.h"
 #include "googleurl/src/gurl.h"
diff --git a/webkit/fileapi/file_system_origin_database.cc b/webkit/fileapi/file_system_origin_database.cc
index d0a010f..4e5a2cf 100644
--- a/webkit/fileapi/file_system_origin_database.cc
+++ b/webkit/fileapi/file_system_origin_database.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/fileapi/file_system_origin_database.h"
 
+#include <set>
+
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/location.h"
@@ -41,7 +43,7 @@ const char* LastPathKey() {
   return kLastPathKey;
 }
 
-}
+}  // namespace
 
 namespace fileapi {
 
@@ -262,7 +264,7 @@ bool FileSystemOriginDatabase::ListAllOrigins(
   std::string origin_key_prefix = OriginToOriginKey("");
   iter->Seek(origin_key_prefix);
   origins->clear();
-  while(iter->Valid() &&
+  while (iter->Valid() &&
       StartsWithASCII(iter->key().ToString(), origin_key_prefix, true)) {
     std::string origin =
       iter->key().ToString().substr(origin_key_prefix.length());
diff --git a/webkit/fileapi/file_system_origin_database_unittest.cc b/webkit/fileapi/file_system_origin_database_unittest.cc
index 77bd3a8..e92b814 100644
--- a/webkit/fileapi/file_system_origin_database_unittest.cc
+++ b/webkit/fileapi/file_system_origin_database_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "testing/gtest/include/gtest/gtest.h"
-
 #include <algorithm>
+#include <functional>
+#include <limits>
 #include <string>
 
 #include "base/file_path.h"
@@ -12,6 +12,7 @@
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/db/filename.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "webkit/fileapi/file_system_origin_database.h"
@@ -20,6 +21,7 @@
 namespace fileapi {
 
 namespace {
+
 const FilePath::CharType kFileSystemDirName[] =
     FILE_PATH_LITERAL("File System");
 const FilePath::CharType kOriginDatabaseName[] = FILE_PATH_LITERAL("Origins");
@@ -90,7 +92,7 @@ void CorruptDatabase(const FilePath& db_path,
   base::ClosePlatformFile(file);
 }
 
-}
+}  // namespace
 
 TEST(FileSystemOriginDatabaseTest, BasicTest) {
   ScopedTempDir dir;
diff --git a/webkit/fileapi/file_system_quota_client.h b/webkit/fileapi/file_system_quota_client.h
index 7127387..d5d6403 100644
--- a/webkit/fileapi/file_system_quota_client.h
+++ b/webkit/fileapi/file_system_quota_client.h
@@ -5,11 +5,9 @@
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_QUOTA_CLIENT_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_QUOTA_CLIENT_H_
 
-#include <deque>
-#include <list>
-#include <map>
 #include <set>
 #include <string>
+#include <utility>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
diff --git a/webkit/fileapi/file_system_types.h b/webkit/fileapi/file_system_types.h
index b48d746..1784786 100644
--- a/webkit/fileapi/file_system_types.h
+++ b/webkit/fileapi/file_system_types.h
@@ -32,6 +32,6 @@ enum FileSystemType {
   kFileSystemTypeExternal = WebKit::WebFileSystem::TypeExternal,
 };
 
-}
+}  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_TYPES_H_
diff --git a/webkit/fileapi/file_system_url_request_job.cc b/webkit/fileapi/file_system_url_request_job.cc
index 3aa936e..d56f2fd8 100644
--- a/webkit/fileapi/file_system_url_request_job.cc
+++ b/webkit/fileapi/file_system_url_request_job.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/fileapi/file_system_url_request_job.h"
 
+#include <vector>
+
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ -147,9 +149,9 @@ void FileSystemURLRequestJob::SetExtraRequestHeaders(
   if (headers.GetHeader(net::HttpRequestHeaders::kRange, &range_header)) {
     std::vector<net::HttpByteRange> ranges;
     if (net::HttpUtil::ParseRangeHeader(range_header, &ranges)) {
-      if (ranges.size() == 1)
+      if (ranges.size() == 1) {
         byte_range_ = ranges[0];
-      else {
+      } else {
         // We don't support multiple range requests in one single URL request.
         // TODO(adamk): decide whether we want to support multiple range
         // requests.
diff --git a/webkit/fileapi/file_system_url_request_job_factory.cc b/webkit/fileapi/file_system_url_request_job_factory.cc
index 42b7ffc..4e5855a 100644
--- a/webkit/fileapi/file_system_url_request_job_factory.cc
+++ b/webkit/fileapi/file_system_url_request_job_factory.cc
@@ -1,9 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_url_request_job_factory.h"
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "net/url_request/url_request.h"
diff --git a/webkit/fileapi/file_system_url_request_job_factory.h b/webkit/fileapi/file_system_url_request_job_factory.h
index 77e955d..1e4e4c6 100644
--- a/webkit/fileapi/file_system_url_request_job_factory.h
+++ b/webkit/fileapi/file_system_url_request_job_factory.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_FILE_SYSTEM_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
-#define WEBKIT_FILE_SYSTEM_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
+#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
+#define WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
 
 #include "net/url_request/url_request_job_factory.h"
 
@@ -24,4 +24,4 @@ CreateFileSystemProtocolHandler(FileSystemContext* context,
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILE_SYSTEM_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
+#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc
index b8151ac..015839f 100644
--- a/webkit/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_url_request_job_unittest.cc
@@ -10,8 +10,6 @@
 
 #include "webkit/fileapi/file_system_url_request_job.h"
 
-#include "build/build_config.h"
-
 #include <string>
 
 #include "base/bind.h"
@@ -368,5 +366,5 @@ TEST_F(FileSystemURLRequestJobTest, GetMimeType) {
   EXPECT_EQ(mime_type_direct, mime_type_from_job);
 }
 
-}  // namespace (anonymous)
+}  // namespace
 }  // namespace fileapi
diff --git a/webkit/fileapi/file_system_usage_cache_unittest.cc b/webkit/fileapi/file_system_usage_cache_unittest.cc
index fddfedd..3fa92dd 100644
--- a/webkit/fileapi/file_system_usage_cache_unittest.cc
+++ b/webkit/fileapi/file_system_usage_cache_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -19,7 +19,7 @@ class FileSystemUsageCacheTest : public testing::Test {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
   }
 
-protected:
+ protected:
   FilePath GetUsageFilePath() {
     return data_dir_.path().AppendASCII(FileSystemUsageCache::kUsageFileName);
   }
diff --git a/webkit/fileapi/file_system_util.cc b/webkit/fileapi/file_system_util.cc
index 85e3512..968aa71 100644
--- a/webkit/fileapi/file_system_util.cc
+++ b/webkit/fileapi/file_system_util.cc
@@ -85,7 +85,7 @@ bool CrackFileSystemURL(const GURL& url, GURL* origin_url, FileSystemType* type,
   return true;
 }
 
-//TODO(ericu): Consider removing support for '\', even on Windows, if possible.
+// TODO(ericu): Consider removing support for '\', even on Windows, if possible.
 // There's a lot of test code that will need reworking, and we may have trouble
 // with FilePath elsewhere [e.g. DirName and other methods may also need
 // replacement].
diff --git a/webkit/fileapi/file_system_util.h b/webkit/fileapi/file_system_util.h
index 475565f..5ac08af 100644
--- a/webkit/fileapi/file_system_util.h
+++ b/webkit/fileapi/file_system_util.h
@@ -6,6 +6,9 @@
 #define WEBKIT_FILEAPI_FILE_SYSTEM_UTIL_H_
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "base/file_path.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/quota/quota_types.h"
diff --git a/webkit/fileapi/file_util_helper.cc b/webkit/fileapi/file_util_helper.cc
index 43062f6..6914cea 100644
--- a/webkit/fileapi/file_util_helper.cc
+++ b/webkit/fileapi/file_util_helper.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/fileapi/file_util_helper.h"
 
+#include <stack>
+
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path.h"
diff --git a/webkit/fileapi/file_util_helper.h b/webkit/fileapi/file_util_helper.h
index 23f3e0b..61d8b50 100644
--- a/webkit/fileapi/file_util_helper.h
+++ b/webkit/fileapi/file_util_helper.h
@@ -5,6 +5,8 @@
 #ifndef WEBKIT_FILEAPI_FILE_UTIL_HELPER_H_
 #define WEBKIT_FILEAPI_FILE_UTIL_HELPER_H_
 
+#include <vector>
+
 #include "base/file_util_proxy.h"
 #include "base/platform_file.h"
 
diff --git a/webkit/fileapi/isolated_context.h b/webkit/fileapi/isolated_context.h
index de4afda..cd2850c 100644
--- a/webkit/fileapi/isolated_context.h
+++ b/webkit/fileapi/isolated_context.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
diff --git a/webkit/fileapi/isolated_file_util.cc b/webkit/fileapi/isolated_file_util.cc
index f699135..e23c006 100644
--- a/webkit/fileapi/isolated_file_util.cc
+++ b/webkit/fileapi/isolated_file_util.cc
@@ -4,6 +4,9 @@
 
 #include "webkit/fileapi/isolated_file_util.h"
 
+#include <string>
+#include <vector>
+
 #include "base/memory/scoped_ptr.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
diff --git a/webkit/fileapi/isolated_file_util.h b/webkit/fileapi/isolated_file_util.h
index d49c6ac..c784cdb 100644
--- a/webkit/fileapi/isolated_file_util.h
+++ b/webkit/fileapi/isolated_file_util.h
@@ -21,7 +21,7 @@ class IsolatedContext;
 
 class IsolatedFileUtil : public FileSystemFileUtil {
  public:
-  IsolatedFileUtil(FileSystemFileUtil* underlying_file_util);
+  explicit IsolatedFileUtil(FileSystemFileUtil* underlying_file_util);
   virtual ~IsolatedFileUtil() {}
 
   // FileSystemFileUtil overrides.
diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc
index a422ff9..f8c695e 100644
--- a/webkit/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/fileapi/isolated_file_util_unittest.cc
@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <map>
+#include <set>
 #include <string>
+#include <vector>
 
 #include "base/file_util.h"
 #include "base/logging.h"
diff --git a/webkit/fileapi/isolated_mount_point_provider.cc b/webkit/fileapi/isolated_mount_point_provider.cc
index e05833c..4e92df2 100644
--- a/webkit/fileapi/isolated_mount_point_provider.cc
+++ b/webkit/fileapi/isolated_mount_point_provider.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/fileapi/isolated_mount_point_provider.h"
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/logging.h"
diff --git a/webkit/fileapi/isolated_mount_point_provider.h b/webkit/fileapi/isolated_mount_point_provider.h
index 3784b40..c6be4fc 100644
--- a/webkit/fileapi/isolated_mount_point_provider.h
+++ b/webkit/fileapi/isolated_mount_point_provider.h
@@ -5,6 +5,8 @@
 #ifndef WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_
 #define WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_
 
+#include <vector>
+
 #include "base/memory/scoped_ptr.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 
diff --git a/webkit/fileapi/mock_file_system_options.cc b/webkit/fileapi/mock_file_system_options.cc
index 8514286..1fe79ec 100644
--- a/webkit/fileapi/mock_file_system_options.cc
+++ b/webkit/fileapi/mock_file_system_options.cc
@@ -4,6 +4,9 @@
 
 #include "webkit/fileapi/mock_file_system_options.h"
 
+#include <string>
+#include <vector>
+
 namespace fileapi {
 
 FileSystemOptions CreateIncognitoFileSystemOptions() {
diff --git a/webkit/fileapi/quota_file_util_unittest.cc b/webkit/fileapi/quota_file_util_unittest.cc
index eec737a..5ab16b6 100644
--- a/webkit/fileapi/quota_file_util_unittest.cc
+++ b/webkit/fileapi/quota_file_util_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/fileapi/quota_file_util.h"
 
+#include <string>
+
 #include "base/file_path.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
@@ -15,7 +17,6 @@
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_util_helper.h"
-#include "webkit/fileapi/quota_file_util.h"
 
 namespace fileapi {
 
diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
index 5433722..ac86d37 100644
--- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
@@ -208,7 +208,6 @@ class SandboxMountPointProviderMigrationTest : public testing::Test {
 
   void ValidateDataInNewFileSystem(
       const GURL& origin_url, fileapi::FileSystemType type) {
-
     scoped_ptr<FileSystemOperationContext> context;
     FilePath seed_file_path = FilePath().AppendASCII(
         URLAndTypeToSeedString(origin_url, type));
diff --git a/webkit/fileapi/test_file_set.cc b/webkit/fileapi/test_file_set.cc
index 995ab6f..6d30f74 100644
--- a/webkit/fileapi/test_file_set.cc
+++ b/webkit/fileapi/test_file_set.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/fileapi/test_file_set.h"
 
+#include <string>
+
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/platform_file.h"