FileAPI: Satisfy linter

Mechanical changes only.


BUG=n/a
TEST=n/a
NOTRY=true

Review URL: https://codereview.chromium.org/26222002

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

21 files changed, 79 insertions, 47 deletions

diff --git a/webkit/browser/fileapi/async_file_util.h b/webkit/browser/fileapi/async_file_util.h
index 4b3a9f6..a5ea621 100644
--- a/webkit/browser/fileapi/async_file_util.h
+++ b/webkit/browser/fileapi/async_file_util.h
@@ -5,6 +5,8 @@
 #ifndef WEBKIT_BROWSER_FILEAPI_ASYNC_FILE_UTIL_H_
 #define WEBKIT_BROWSER_FILEAPI_ASYNC_FILE_UTIL_H_
 
+#include <vector>
+
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file_util_proxy.h"
@@ -74,8 +76,8 @@ class AsyncFileUtil {
       void(base::PlatformFileError result,
            const base::PlatformFileInfo& file_info,
            const base::FilePath& platform_path,
-           const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref
-           )> CreateSnapshotFileCallback;
+           const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref)>
+      CreateSnapshotFileCallback;
 
 
   typedef base::Callback<void(int64 size)> CopyFileProgressCallback;
diff --git a/webkit/browser/fileapi/async_file_util_adapter.cc b/webkit/browser/fileapi/async_file_util_adapter.cc
index 831e937..b25ddf2 100644
--- a/webkit/browser/fileapi/async_file_util_adapter.cc
+++ b/webkit/browser/fileapi/async_file_util_adapter.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/browser/fileapi/async_file_util_adapter.h"
 
+#include <vector>
+
 #include "base/bind.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
@@ -168,10 +170,10 @@ void AsyncFileUtilAdapter::EnsureFileExists(
   EnsureFileExistsHelper* helper = new EnsureFileExistsHelper;
   FileSystemOperationContext* context_ptr = context.release();
   const bool success = context_ptr->task_runner()->PostTaskAndReply(
-        FROM_HERE,
-        Bind(&EnsureFileExistsHelper::RunWork, Unretained(helper),
-             sync_file_util_.get(), base::Owned(context_ptr), url),
-        Bind(&EnsureFileExistsHelper::Reply, Owned(helper), callback));
+      FROM_HERE,
+      Bind(&EnsureFileExistsHelper::RunWork, Unretained(helper),
+           sync_file_util_.get(), base::Owned(context_ptr), url),
+      Bind(&EnsureFileExistsHelper::Reply, Owned(helper), callback));
   DCHECK(success);
 }
 
@@ -198,10 +200,10 @@ void AsyncFileUtilAdapter::GetFileInfo(
   FileSystemOperationContext* context_ptr = context.release();
   GetFileInfoHelper* helper = new GetFileInfoHelper;
   const bool success = context_ptr->task_runner()->PostTaskAndReply(
-        FROM_HERE,
-        Bind(&GetFileInfoHelper::GetFileInfo, Unretained(helper),
-             sync_file_util_.get(), base::Owned(context_ptr), url),
-        Bind(&GetFileInfoHelper::ReplyFileInfo, Owned(helper), callback));
+      FROM_HERE,
+      Bind(&GetFileInfoHelper::GetFileInfo, Unretained(helper),
+           sync_file_util_.get(), base::Owned(context_ptr), url),
+      Bind(&GetFileInfoHelper::ReplyFileInfo, Owned(helper), callback));
   DCHECK(success);
 }
 
@@ -212,10 +214,10 @@ void AsyncFileUtilAdapter::ReadDirectory(
   FileSystemOperationContext* context_ptr = context.release();
   ReadDirectoryHelper* helper = new ReadDirectoryHelper;
   const bool success = context_ptr->task_runner()->PostTaskAndReply(
-        FROM_HERE,
-        Bind(&ReadDirectoryHelper::RunWork, Unretained(helper),
-             sync_file_util_.get(), base::Owned(context_ptr), url),
-        Bind(&ReadDirectoryHelper::Reply, Owned(helper), callback));
+      FROM_HERE,
+      Bind(&ReadDirectoryHelper::RunWork, Unretained(helper),
+           sync_file_util_.get(), base::Owned(context_ptr), url),
+      Bind(&ReadDirectoryHelper::Reply, Owned(helper), callback));
   DCHECK(success);
 }
 
@@ -340,10 +342,10 @@ void AsyncFileUtilAdapter::CreateSnapshotFile(
   FileSystemOperationContext* context_ptr = context.release();
   GetFileInfoHelper* helper = new GetFileInfoHelper;
   const bool success = context_ptr->task_runner()->PostTaskAndReply(
-        FROM_HERE,
-        Bind(&GetFileInfoHelper::CreateSnapshotFile, Unretained(helper),
-             sync_file_util_.get(), base::Owned(context_ptr), url),
-        Bind(&GetFileInfoHelper::ReplySnapshotFile, Owned(helper), callback));
+      FROM_HERE,
+      Bind(&GetFileInfoHelper::CreateSnapshotFile, Unretained(helper),
+           sync_file_util_.get(), base::Owned(context_ptr), url),
+      Bind(&GetFileInfoHelper::ReplySnapshotFile, Owned(helper), callback));
   DCHECK(success);
 }
 
diff --git a/webkit/browser/fileapi/copy_or_move_operation_delegate.cc b/webkit/browser/fileapi/copy_or_move_operation_delegate.cc
index a11f941..d83dc99 100644
--- a/webkit/browser/fileapi/copy_or_move_operation_delegate.cc
+++ b/webkit/browser/fileapi/copy_or_move_operation_delegate.cc
@@ -26,8 +26,11 @@ class CopyOrMoveOperationDelegate::CopyOrMoveImpl {
   virtual void Run(
       const CopyOrMoveOperationDelegate::StatusCallback& callback) = 0;
   virtual void Cancel() = 0;
+
  protected:
   CopyOrMoveImpl() {}
+
+ private:
   DISALLOW_COPY_AND_ASSIGN(CopyOrMoveImpl);
 };
 
diff --git a/webkit/browser/fileapi/copy_or_move_operation_delegate.h b/webkit/browser/fileapi/copy_or_move_operation_delegate.h
index 8321134..3d45a41 100644
--- a/webkit/browser/fileapi/copy_or_move_operation_delegate.h
+++ b/webkit/browser/fileapi/copy_or_move_operation_delegate.h
@@ -5,6 +5,7 @@
 #ifndef WEBKIT_BROWSER_FILEAPI_COPY_OR_MOVE_OPERATION_DELEGATE_H_
 #define WEBKIT_BROWSER_FILEAPI_COPY_OR_MOVE_OPERATION_DELEGATE_H_
 
+#include <set>
 #include <stack>
 
 #include "base/memory/ref_counted.h"
diff --git a/webkit/browser/fileapi/external_mount_points_unittest.cc b/webkit/browser/fileapi/external_mount_points_unittest.cc
index cc2acbe..4108fa3 100644
--- a/webkit/browser/fileapi/external_mount_points_unittest.cc
+++ b/webkit/browser/fileapi/external_mount_points_unittest.cc
@@ -287,7 +287,9 @@ TEST(ExternalMountPointsTest, CreateCrackedFileSystemURL) {
 
   // Try native local which is not cracked.
   FileSystemURL native_local = mount_points->CreateCrackedFileSystemURL(
-      kTestOrigin, fileapi::kFileSystemTypeNativeLocal, base::FilePath(FPL("c")));
+      kTestOrigin,
+      fileapi::kFileSystemTypeNativeLocal,
+      base::FilePath(FPL("c")));
   EXPECT_FALSE(native_local.is_valid());
 
   struct TestCase {
@@ -355,8 +357,8 @@ TEST(ExternalMountPointsTest, CreateCrackedFileSystemURL) {
         << "Test case index: " << i;
     EXPECT_EQ(kTestCases[i].expect_type, cracked.type())
         << "Test case index: " << i;
-    EXPECT_EQ(base::FilePath(kTestCases[i].expect_path).NormalizePathSeparators(),
-                       cracked.path())
+    EXPECT_EQ(base::FilePath(
+        kTestCases[i].expect_path).NormalizePathSeparators(), cracked.path())
         << "Test case index: " << i;
     EXPECT_EQ(base::FilePath(kTestCases[i].path).NormalizePathSeparators(),
                        cracked.virtual_path())
@@ -450,8 +452,8 @@ TEST(ExternalMountPointsTest, CrackVirtualPath) {
 
     EXPECT_EQ(kTestCases[i].expect_type, cracked_type)
         << "Test case index: " << i;
-    EXPECT_EQ(base::FilePath(kTestCases[i].expect_path).NormalizePathSeparators(),
-                       cracked_path)
+    EXPECT_EQ(base::FilePath(
+        kTestCases[i].expect_path).NormalizePathSeparators(), cracked_path)
         << "Test case index: " << i;
     EXPECT_EQ(kTestCases[i].expect_name, cracked_name)
         << "Test case index: " << i;
diff --git a/webkit/browser/fileapi/file_system_backend.h b/webkit/browser/fileapi/file_system_backend.h
index 2c8be93..048c86d 100644
--- a/webkit/browser/fileapi/file_system_backend.h
+++ b/webkit/browser/fileapi/file_system_backend.h
@@ -98,10 +98,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemBackend {
   // This method itself does *not* check if the given path exists and is a
   // regular file.
   virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
-    const FileSystemURL& url,
-    int64 offset,
-    const base::Time& expected_modification_time,
-    FileSystemContext* context) const = 0;
+      const FileSystemURL& url,
+      int64 offset,
+      const base::Time& expected_modification_time,
+      FileSystemContext* context) const = 0;
 
   // Creates a new file stream writer for a given filesystem URL |url| with an
   // offset |offset|.
diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job.cc b/webkit/browser/fileapi/file_system_dir_url_request_job.cc
index 721a228..7589b37 100644
--- a/webkit/browser/fileapi/file_system_dir_url_request_job.cc
+++ b/webkit/browser/fileapi/file_system_dir_url_request_job.cc
@@ -117,7 +117,8 @@ void FileSystemDirURLRequestJob::DidReadDirectory(
   if (data_.empty()) {
     base::FilePath relative_path = url_.path();
 #if defined(OS_POSIX)
-    relative_path = base::FilePath(FILE_PATH_LITERAL("/") + relative_path.value());
+    relative_path =
+        base::FilePath(FILE_PATH_LITERAL("/") + relative_path.value());
 #endif
     const base::string16& title = relative_path.LossyDisplayName();
     data_.append(net::GetDirectoryListingHeader(title));
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.cc b/webkit/browser/fileapi/file_system_file_stream_reader.cc
index d3697c2..f5427b7 100644
--- a/webkit/browser/fileapi/file_system_file_stream_reader.cc
+++ b/webkit/browser/fileapi/file_system_file_stream_reader.cc
@@ -32,7 +32,7 @@ FileStreamReader* FileStreamReader::CreateForFileSystemFile(
       expected_modification_time);
 }
 
-}  // webkit_blob
+}  // namespace webkit_blob
 
 namespace fileapi {
 
diff --git a/webkit/browser/fileapi/file_system_operation_runner.h b/webkit/browser/fileapi/file_system_operation_runner.h
index 9ca4725..b19a700 100644
--- a/webkit/browser/fileapi/file_system_operation_runner.h
+++ b/webkit/browser/fileapi/file_system_operation_runner.h
@@ -6,6 +6,8 @@
 #define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_OPERATION_RUNNER_H_
 
 #include <map>
+#include <set>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/id_map.h"
diff --git a/webkit/browser/fileapi/file_writer_delegate.h b/webkit/browser/fileapi/file_writer_delegate.h
index ae63e7f..f7ce16d 100644
--- a/webkit/browser/fileapi/file_writer_delegate.h
+++ b/webkit/browser/fileapi/file_writer_delegate.h
@@ -34,7 +34,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileWriterDelegate
                               WriteProgressStatus write_status)>
       DelegateWriteCallback;
 
-  FileWriterDelegate(scoped_ptr<FileStreamWriter> file_writer);
+  explicit FileWriterDelegate(scoped_ptr<FileStreamWriter> file_writer);
   virtual ~FileWriterDelegate();
 
   void Start(scoped_ptr<net::URLRequest> request,
diff --git a/webkit/browser/fileapi/isolated_context.cc b/webkit/browser/fileapi/isolated_context.cc
index d10438a..09c5f56 100644
--- a/webkit/browser/fileapi/isolated_context.cc
+++ b/webkit/browser/fileapi/isolated_context.cc
@@ -26,8 +26,8 @@ base::FilePath::StringType GetRegisterNameForPath(const base::FilePath& path) {
 #if defined(FILE_PATH_USES_DRIVE_LETTERS)
   base::FilePath::StringType name;
   for (size_t i = 0;
-        i < path.value().size() && !base::FilePath::IsSeparator(path.value()[i]);
-        ++i) {
+       i < path.value().size() && !base::FilePath::IsSeparator(path.value()[i]);
+       ++i) {
     if (path.value()[i] == L':') {
       name.append(L"_drive");
       break;
@@ -78,8 +78,10 @@ bool IsolatedContext::FileInfoSet::AddPath(
       fileset_.insert(MountPointInfo(utf8name, normalized_path)).second;
   if (!inserted) {
     int suffix = 1;
-    std::string basepart = base::FilePath(name).RemoveExtension().AsUTF8Unsafe();
-    std::string ext = base::FilePath(base::FilePath(name).Extension()).AsUTF8Unsafe();
+    std::string basepart =
+        base::FilePath(name).RemoveExtension().AsUTF8Unsafe();
+    std::string ext =
+        base::FilePath(base::FilePath(name).Extension()).AsUTF8Unsafe();
     while (!inserted) {
       utf8name = base::StringPrintf("%s (%d)", basepart.c_str(), suffix++);
       if (!ext.empty())
diff --git a/webkit/browser/fileapi/isolated_context_unittest.cc b/webkit/browser/fileapi/isolated_context_unittest.cc
index 36073ca..a513ec2 100644
--- a/webkit/browser/fileapi/isolated_context_unittest.cc
+++ b/webkit/browser/fileapi/isolated_context_unittest.cc
@@ -186,8 +186,9 @@ TEST_F(IsolatedContextTest, CrackWithRelativePaths) {
     for (size_t j = 0; j < ARRAYSIZE_UNSAFE(relatives); ++j) {
       SCOPED_TRACE(testing::Message() << "Testing "
                    << kTestPaths[i].value() << " " << relatives[j].path);
-      base::FilePath virtual_path = isolated_context()->CreateVirtualRootPath(id_)
-          .AppendASCII(names_[i]).Append(relatives[j].path);
+      base::FilePath virtual_path =
+          isolated_context()->CreateVirtualRootPath(id_).AppendASCII(
+              names_[i]).Append(relatives[j].path);
       std::string cracked_id;
       base::FilePath cracked_path;
       FileSystemType cracked_type;
@@ -230,8 +231,9 @@ TEST_F(IsolatedContextTest, CrackURLWithRelativePaths) {
     for (size_t j = 0; j < ARRAYSIZE_UNSAFE(relatives); ++j) {
       SCOPED_TRACE(testing::Message() << "Testing "
                    << kTestPaths[i].value() << " " << relatives[j].path);
-      base::FilePath virtual_path = isolated_context()->CreateVirtualRootPath(id_)
-          .AppendASCII(names_[i]).Append(relatives[j].path);
+      base::FilePath virtual_path =
+          isolated_context()->CreateVirtualRootPath(id_).AppendASCII(
+              names_[i]).Append(relatives[j].path);
 
       FileSystemURL cracked = isolated_context()->CreateCrackedFileSystemURL(
           GURL("http://chromium.org"), kFileSystemTypeIsolated, virtual_path);
diff --git a/webkit/browser/fileapi/native_file_util_unittest.cc b/webkit/browser/fileapi/native_file_util_unittest.cc
index e2b07e89..47f88ea 100644
--- a/webkit/browser/fileapi/native_file_util_unittest.cc
+++ b/webkit/browser/fileapi/native_file_util_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <set>
+
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
diff --git a/webkit/browser/fileapi/obfuscated_file_util.cc b/webkit/browser/fileapi/obfuscated_file_util.cc
index 2643d7e..9c5ca60 100644
--- a/webkit/browser/fileapi/obfuscated_file_util.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util.cc
@@ -60,9 +60,9 @@ void InitFileInfo(
 
 // Costs computed as per crbug.com/86114, based on the LevelDB implementation of
 // path storage under Linux.  It's not clear if that will differ on Windows, on
-// which base::FilePath uses wide chars [since they're converted to UTF-8 for storage
-// anyway], but as long as the cost is high enough that one can't cheat on quota
-// by storing data in paths, it doesn't need to be all that accurate.
+// which base::FilePath uses wide chars [since they're converted to UTF-8 for
+// storage anyway], but as long as the cost is high enough that one can't cheat
+// on quota by storing data in paths, it doesn't need to be all that accurate.
 const int64 kPathCreationQuotaCost = 146;  // Bytes per inode, basically.
 const int64 kPathByteQuotaCost = 2;  // Bytes per byte of path length in UTF-8.
 
@@ -96,9 +96,12 @@ void TouchDirectory(SandboxDirectoryDatabase* db, FileId dir_id) {
     NOTREACHED();
 }
 
-const base::FilePath::CharType kTemporaryDirectoryName[] = FILE_PATH_LITERAL("t");
-const base::FilePath::CharType kPersistentDirectoryName[] = FILE_PATH_LITERAL("p");
-const base::FilePath::CharType kSyncableDirectoryName[] = FILE_PATH_LITERAL("s");
+const base::FilePath::CharType kTemporaryDirectoryName[] =
+    FILE_PATH_LITERAL("t");
+const base::FilePath::CharType kPersistentDirectoryName[] =
+    FILE_PATH_LITERAL("p");
+const base::FilePath::CharType kSyncableDirectoryName[] =
+    FILE_PATH_LITERAL("s");
 
 enum IsolatedOriginStatus {
   kIsolatedOriginMatch,
@@ -265,7 +268,7 @@ ObfuscatedFileUtil::ObfuscatedFileUtil(
     base::SequencedTaskRunner* file_task_runner)
     : special_storage_policy_(special_storage_policy),
       file_system_directory_(file_system_directory),
-      db_flush_delay_seconds_(10 * 60), // 10 mins.
+      db_flush_delay_seconds_(10 * 60),  // 10 mins.
       file_task_runner_(file_task_runner) {
 }
 
diff --git a/webkit/browser/fileapi/sandbox_database_test_helper.cc b/webkit/browser/fileapi/sandbox_database_test_helper.cc
index 6364b2b..5c9176c 100644
--- a/webkit/browser/fileapi/sandbox_database_test_helper.cc
+++ b/webkit/browser/fileapi/sandbox_database_test_helper.cc
@@ -94,7 +94,6 @@ void DeleteDatabaseFile(const base::FilePath& db_path,
       // We may have multiple files for the same type, so don't break here.
     }
   }
-
 }
 
 }  // namespace fileapi
diff --git a/webkit/browser/fileapi/sandbox_directory_database_unittest.cc b/webkit/browser/fileapi/sandbox_directory_database_unittest.cc
index 9281446..033a992 100644
--- a/webkit/browser/fileapi/sandbox_directory_database_unittest.cc
+++ b/webkit/browser/fileapi/sandbox_directory_database_unittest.cc
@@ -141,6 +141,7 @@ class SandboxDirectoryDatabaseTest : public testing::Test {
   base::ScopedTempDir base_;
   scoped_ptr<SandboxDirectoryDatabase> db_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(SandboxDirectoryDatabaseTest);
 };
 
diff --git a/webkit/browser/fileapi/sandbox_isolated_origin_database.h b/webkit/browser/fileapi/sandbox_isolated_origin_database.h
index 2505659..3d0de56 100644
--- a/webkit/browser/fileapi/sandbox_isolated_origin_database.h
+++ b/webkit/browser/fileapi/sandbox_isolated_origin_database.h
@@ -5,6 +5,9 @@
 #ifndef WEBKIT_BROWSER_FILEAPI_SANDBOX_ISOLATED_ORIGIN_DATABASE_H_
 #define WEBKIT_BROWSER_FILEAPI_SANDBOX_ISOLATED_ORIGIN_DATABASE_H_
 
+#include <string>
+#include <vector>
+
 #include "webkit/browser/fileapi/sandbox_origin_database_interface.h"
 
 namespace fileapi {
diff --git a/webkit/browser/fileapi/sandbox_origin_database.h b/webkit/browser/fileapi/sandbox_origin_database.h
index 94cde47..dd3b32c 100644
--- a/webkit/browser/fileapi/sandbox_origin_database.h
+++ b/webkit/browser/fileapi/sandbox_origin_database.h
@@ -5,6 +5,9 @@
 #ifndef WEBKIT_BROWSER_FILEAPI_SANDBOX_ORIGIN_DATABASE_H_
 #define WEBKIT_BROWSER_FILEAPI_SANDBOX_ORIGIN_DATABASE_H_
 
+#include <string>
+#include <vector>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "webkit/browser/fileapi/sandbox_origin_database_interface.h"
diff --git a/webkit/browser/fileapi/sandbox_origin_database_unittest.cc b/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
index 867dc27..87c5e23 100644
--- a/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
+++ b/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
@@ -6,6 +6,7 @@
 #include <functional>
 #include <limits>
 #include <string>
+#include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
diff --git a/webkit/browser/fileapi/test_file_set.h b/webkit/browser/fileapi/test_file_set.h
index 59e90ab..eb445213 100644
--- a/webkit/browser/fileapi/test_file_set.h
+++ b/webkit/browser/fileapi/test_file_set.h
@@ -29,7 +29,8 @@ extern const size_t kRegularTestCaseSize;
 size_t GetRegularTestCaseSize();
 
 // Creates one file or directory specified by |record|.
-void SetUpOneTestCase(const base::FilePath& root_path, const TestCaseRecord& record);
+void SetUpOneTestCase(const base::FilePath& root_path,
+                      const TestCaseRecord& record);
 
 // Creates the files and directories specified in kRegularTestCases.
 void SetUpRegularTestCases(const base::FilePath& root_path);
diff --git a/webkit/browser/fileapi/upload_file_system_file_element_reader.cc b/webkit/browser/fileapi/upload_file_system_file_element_reader.cc
index 3fb5ab4..46a57f0 100644
--- a/webkit/browser/fileapi/upload_file_system_file_element_reader.cc
+++ b/webkit/browser/fileapi/upload_file_system_file_element_reader.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/browser/fileapi/upload_file_system_file_element_reader.h"
 
+#include <algorithm>
+
 #include "base/bind.h"
 #include "net/base/net_errors.h"
 #include "webkit/browser/blob/file_stream_reader.h"