diff options
author | adamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 01:20:01 +0000 |
---|---|---|
committer | adamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 01:20:01 +0000 |
commit | 3ed847a6f774ee7aafdf24ff158f968919163f1a (patch) | |
tree | d062db546989ea8a221a006653351d1cee4cbe64 /webkit | |
parent | f5e713b5b6154f002bcaf7b1ee3d4fece3faaae1 (diff) | |
download | chromium_src-3ed847a6f774ee7aafdf24ff158f968919163f1a.zip chromium_src-3ed847a6f774ee7aafdf24ff158f968919163f1a.tar.gz chromium_src-3ed847a6f774ee7aafdf24ff158f968919163f1a.tar.bz2 |
Move all webkit/fileapi tests to content_unittests
Most were previously in test_shell_tests, which we're trying to kill.
The rest were in unit_tests, and are being moved for consistency's sake.
BUG=126514
Review URL: https://chromiumcodereview.appspot.com/10447043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
15 files changed, 14 insertions, 53 deletions
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 d5ba78d..751c861 100644 --- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc @@ -1,12 +1,6 @@ // 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. -// -// NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit) -// rather than as part of test_shell_tests because they rely on being able -// to instantiate a MessageLoop of type TYPE_IO. test_shell_tests uses -// TYPE_UI, which URLRequest doesn't allow. -// #include "webkit/fileapi/file_system_dir_url_request_job.h" diff --git a/webkit/fileapi/file_system_file_util_unittest.cc b/webkit/fileapi/file_system_file_util_unittest.cc index ebb57e3..cd0057d 100644 --- a/webkit/fileapi/file_system_file_util_unittest.cc +++ b/webkit/fileapi/file_system_file_util_unittest.cc @@ -5,6 +5,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/message_loop.h" #include "base/platform_file.h" #include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" @@ -149,6 +150,7 @@ class FileSystemFileUtilTest : public testing::Test { } private: + MessageLoop message_loop_; DISALLOW_COPY_AND_ASSIGN(FileSystemFileUtilTest); }; diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc index f56ce8c..b5b07a2 100644 --- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc +++ b/webkit/fileapi/file_system_mount_point_provider_unittest.cc @@ -219,7 +219,7 @@ class FileSystemMountPointProviderTest : public testing::Test { #if defined(OS_CHROMEOS) ExternalFileSystemMountPointProvider* external_provider = file_system_context_->external_provider(); - external_provider->AddMountPoint(FilePath(kMountPoint)); + external_provider->AddLocalMountPoint(FilePath(kMountPoint)); #endif } @@ -254,6 +254,7 @@ class FileSystemMountPointProviderTest : public testing::Test { private: ScopedTempDir data_dir_; + MessageLoop message_loop_; base::WeakPtrFactory<FileSystemMountPointProviderTest> weak_factory_; scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_; diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc index 9eabd5e..85f1cbe 100644 --- a/webkit/fileapi/file_system_operation_unittest.cc +++ b/webkit/fileapi/file_system_operation_unittest.cc @@ -379,6 +379,7 @@ class FileSystemOperationTest scoped_refptr<ShareableFileReference> shareable_file_ref_; private: + MessageLoop message_loop_; scoped_refptr<QuotaManager> quota_manager_; scoped_refptr<QuotaManagerProxy> quota_manager_proxy_; diff --git a/webkit/fileapi/file_system_operation_write_unittest.cc b/webkit/fileapi/file_system_operation_write_unittest.cc index 146310d..1a93eb7 100644 --- a/webkit/fileapi/file_system_operation_write_unittest.cc +++ b/webkit/fileapi/file_system_operation_write_unittest.cc @@ -1,12 +1,6 @@ // 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. -// -// NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit) -// rather than as part of test_shell_tests because they rely on being able -// to instantiate a MessageLoop of type TYPE_IO. test_shell_tests uses -// TYPE_UI, which URLRequest doesn't allow. -// #include <vector> diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/fileapi/file_system_quota_client_unittest.cc index aa99ff3..1aa998e 100644 --- a/webkit/fileapi/file_system_quota_client_unittest.cc +++ b/webkit/fileapi/file_system_quota_client_unittest.cc @@ -249,6 +249,7 @@ class FileSystemQuotaClientTest : public testing::Test { } ScopedTempDir data_dir_; + MessageLoop message_loop_; scoped_refptr<FileSystemContext> file_system_context_; base::WeakPtrFactory<FileSystemQuotaClientTest> weak_factory_; int64 usage_; diff --git a/webkit/fileapi/file_system_quota_unittest.cc b/webkit/fileapi/file_system_quota_unittest.cc index 4b33ae4..293e353 100644 --- a/webkit/fileapi/file_system_quota_unittest.cc +++ b/webkit/fileapi/file_system_quota_unittest.cc @@ -162,6 +162,7 @@ class FileSystemQuotaTest FileSystemTestOriginHelper test_helper_; ScopedTempDir work_dir_; + MessageLoop message_loop_; scoped_refptr<quota::QuotaManager> quota_manager_; base::WeakPtrFactory<FileSystemQuotaTest> weak_factory_; diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc index cb2107c..1b713f9 100644 --- a/webkit/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_url_request_job_unittest.cc @@ -1,12 +1,6 @@ // 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. -// -// NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit) -// rather than as part of test_shell_tests because they rely on being able -// to instantiate a MessageLoop of type TYPE_IO. test_shell_tests uses -// TYPE_UI, which URLRequest doesn't allow. -// #include "webkit/fileapi/file_system_url_request_job.h" diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc index 73e88b7..d79f03d 100644 --- a/webkit/fileapi/file_writer_delegate_unittest.cc +++ b/webkit/fileapi/file_writer_delegate_unittest.cc @@ -1,12 +1,6 @@ // 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. -// -// NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit) -// rather than as part of test_shell_tests because they rely on being able -// to instantiate a MessageLoop of type TYPE_IO. test_shell_tests uses -// TYPE_UI, which URLRequest doesn't allow. -// #include <string> #include <vector> diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc index 55925c4..5e61144 100644 --- a/webkit/fileapi/isolated_file_util_unittest.cc +++ b/webkit/fileapi/isolated_file_util_unittest.cc @@ -9,6 +9,7 @@ #include "base/file_util.h" #include "base/logging.h" +#include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" @@ -209,6 +210,7 @@ class IsolatedFileUtilTest : public testing::Test { } ScopedTempDir data_dir_; + MessageLoop message_loop_; std::string filesystem_id_; scoped_refptr<FileSystemContext> file_system_context_; std::map<FilePath, FilePath> toplevel_root_map_; diff --git a/webkit/fileapi/local_file_stream_writer_unittest.cc b/webkit/fileapi/local_file_stream_writer_unittest.cc index 9b2ad7a..69c5ce3 100644 --- a/webkit/fileapi/local_file_stream_writer_unittest.cc +++ b/webkit/fileapi/local_file_stream_writer_unittest.cc @@ -2,11 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// NOTE: These tests are run as part of "unit_tests" (in chrome/test) rather -// than as part of test_shell_tests because they rely on being able to -// instantiate a MessageLoop of type TYPE_IO. test_shell_tests uses TYPE_UI, -// which net::TestCompletionCallback doesn't allow. - #include "webkit/fileapi/local_file_stream_writer.h" #include <string> diff --git a/webkit/fileapi/local_file_util_unittest.cc b/webkit/fileapi/local_file_util_unittest.cc index ed13ff9..f713797 100644 --- a/webkit/fileapi/local_file_util_unittest.cc +++ b/webkit/fileapi/local_file_util_unittest.cc @@ -5,6 +5,7 @@ #include <string> #include "base/file_path.h" +#include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" #include "base/scoped_temp_dir.h" @@ -97,6 +98,7 @@ class LocalFileUtilTest : public testing::Test { private: scoped_ptr<LocalFileUtil> local_file_util_; ScopedTempDir data_dir_; + MessageLoop message_loop_; FileSystemTestOriginHelper test_helper_; DISALLOW_COPY_AND_ASSIGN(LocalFileUtilTest); diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc index 15b320c..cc48067 100644 --- a/webkit/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/fileapi/obfuscated_file_util_unittest.cc @@ -597,6 +597,7 @@ class ObfuscatedFileUtilTest : public testing::Test { private: ScopedTempDir data_dir_; + MessageLoop message_loop_; ObfuscatedFileUtil* obfuscated_file_util_; scoped_refptr<quota::QuotaManager> quota_manager_; scoped_refptr<FileSystemContext> file_system_context_; diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc index 8f59dd1..8bf1fef 100644 --- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc +++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc @@ -53,6 +53,7 @@ class SandboxMountPointProviderOriginEnumeratorTest : public testing::Test { } ScopedTempDir data_dir_; + MessageLoop message_loop_; scoped_ptr<SandboxMountPointProvider> sandbox_provider_; }; @@ -344,6 +345,7 @@ class SandboxMountPointProviderMigrationTest : public testing::Test { protected: ScopedTempDir data_dir_; + MessageLoop message_loop_; scoped_refptr<FileSystemContext> file_system_context_; base::WeakPtrFactory<SandboxMountPointProviderMigrationTest> weak_factory_; }; diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index a0262b0..c2b3f31 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -404,29 +404,6 @@ '../../dom_storage/dom_storage_database_unittest.cc', '../../dom_storage/dom_storage_map_unittest.cc', '../../dom_storage/session_storage_database_unittest.cc', - '../../fileapi/file_system_database_test_helper.cc', - '../../fileapi/file_system_database_test_helper.h', - '../../fileapi/file_system_directory_database_unittest.cc', - '../../fileapi/file_system_file_util_unittest.cc', - '../../fileapi/file_system_mount_point_provider_unittest.cc', - '../../fileapi/file_system_operation_unittest.cc', - '../../fileapi/file_system_origin_database_unittest.cc', - '../../fileapi/file_system_quota_client_unittest.cc', - '../../fileapi/file_system_quota_unittest.cc', - '../../fileapi/file_system_test_helper.cc', - '../../fileapi/file_system_test_helper.h', - '../../fileapi/file_system_usage_cache_unittest.cc', - '../../fileapi/file_system_util_unittest.cc', - '../../fileapi/isolated_context_unittest.cc', - '../../fileapi/isolated_file_util_unittest.cc', - '../../fileapi/local_file_util_unittest.cc', - '../../fileapi/mock_file_system_options.cc', - '../../fileapi/mock_file_system_options.h', - '../../fileapi/obfuscated_file_util_unittest.cc', - '../../fileapi/sandbox_mount_point_provider_unittest.cc', - '../../fileapi/test_file_set.cc', - '../../fileapi/test_file_set.h', - '../../fileapi/webfilewriter_base_unittest.cc', '../../glue/bookmarklet_unittest.cc', '../../glue/cpp_bound_class_unittest.cc', '../../glue/cpp_variant_unittest.cc', |