summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/chrome_tests.gypi1
-rw-r--r--content/content_tests.gypi48
-rw-r--r--webkit/appcache/appcache_group_unittest.cc15
-rw-r--r--webkit/appcache/appcache_host_unittest.cc3
-rw-r--r--webkit/appcache/appcache_quota_client_unittest.cc3
-rw-r--r--webkit/appcache/appcache_service_unittest.cc5
-rw-r--r--webkit/appcache/mock_appcache_storage_unittest.cc6
-rw-r--r--webkit/blob/shareable_file_reference_unittest.cc3
-rw-r--r--webkit/database/database_connections_unittest.cc3
-rw-r--r--webkit/database/database_quota_client_unittest.cc1
-rw-r--r--webkit/database/database_tracker_unittest.cc3
-rw-r--r--webkit/dom_storage/dom_storage_area_unittest.cc3
-rw-r--r--webkit/dom_storage/dom_storage_context_unittest.cc1
-rw-r--r--webkit/quota/mock_quota_manager_unittest.cc1
-rw-r--r--webkit/quota/quota_database_unittest.cc3
-rw-r--r--webkit/quota/quota_manager_unittest.cc1
-rw-r--r--webkit/quota/quota_temporary_storage_evictor_unittest.cc1
-rw-r--r--webkit/tools/test_shell/test_shell.gypi46
18 files changed, 88 insertions, 59 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 14ebc74..fa18d71 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1997,7 +1997,6 @@
'../ui/views/test/test_views_delegate.h',
'../ui/views/test/views_test_base.cc',
'../ui/views/test/views_test_base.h',
- '../webkit/blob/local_file_stream_reader_unittest.cc',
'../webkit/quota/mock_storage_client.cc',
'../webkit/quota/mock_storage_client.h',
],
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index f57aa91..69b997d 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -207,8 +207,10 @@
'../ui/gl/gl.gyp:gl',
'../ui/ui.gyp:ui',
'../v8/tools/gyp/v8.gyp:v8',
+ '../webkit/support/webkit_support.gyp:appcache',
'../webkit/support/webkit_support.gyp:blob',
'../webkit/support/webkit_support.gyp:database',
+ '../webkit/support/webkit_support.gyp:dom_storage',
'../webkit/support/webkit_support.gyp:fileapi',
'../webkit/support/webkit_support.gyp:glue',
'../webkit/support/webkit_support.gyp:quota',
@@ -320,6 +322,42 @@
'test/gpu/gpu_test_config_unittest.cc',
'test/gpu/gpu_test_expectations_parser_unittest.cc',
'test/run_all_unittests.cc',
+ '../webkit/appcache/manifest_parser_unittest.cc',
+ '../webkit/appcache/appcache_unittest.cc',
+ '../webkit/appcache/appcache_database_unittest.cc',
+ '../webkit/appcache/appcache_group_unittest.cc',
+ '../webkit/appcache/appcache_host_unittest.cc',
+ '../webkit/appcache/appcache_quota_client_unittest.cc',
+ '../webkit/appcache/appcache_request_handler_unittest.cc',
+ '../webkit/appcache/appcache_response_unittest.cc',
+ '../webkit/appcache/appcache_service_unittest.cc',
+ '../webkit/appcache/appcache_storage_unittest.cc',
+ '../webkit/appcache/appcache_storage_impl_unittest.cc',
+ '../webkit/appcache/appcache_update_job_unittest.cc',
+ '../webkit/appcache/appcache_url_request_job_unittest.cc',
+ '../webkit/appcache/mock_appcache_policy.h',
+ '../webkit/appcache/mock_appcache_policy.cc',
+ '../webkit/appcache/mock_appcache_service.cc',
+ '../webkit/appcache/mock_appcache_service.h',
+ '../webkit/appcache/mock_appcache_storage.cc',
+ '../webkit/appcache/mock_appcache_storage.h',
+ '../webkit/appcache/mock_appcache_storage_unittest.cc',
+ '../webkit/blob/blob_storage_controller_unittest.cc',
+ '../webkit/blob/blob_url_request_job_unittest.cc',
+ '../webkit/blob/local_file_stream_reader_unittest.cc',
+ '../webkit/blob/shareable_file_reference_unittest.cc',
+ '../webkit/database/database_connections_unittest.cc',
+ '../webkit/database/database_quota_client_unittest.cc',
+ '../webkit/database/databases_table_unittest.cc',
+ '../webkit/database/database_tracker_unittest.cc',
+ '../webkit/database/database_util_unittest.cc',
+ '../webkit/database/quota_table_unittest.cc',
+ '../webkit/dom_storage/dom_storage_area_unittest.cc',
+ '../webkit/dom_storage/dom_storage_cached_area_unittest.cc',
+ '../webkit/dom_storage/dom_storage_context_unittest.cc',
+ '../webkit/dom_storage/dom_storage_database_unittest.cc',
+ '../webkit/dom_storage/dom_storage_map_unittest.cc',
+ '../webkit/dom_storage/session_storage_database_unittest.cc',
'../webkit/fileapi/file_system_database_test_helper.cc',
'../webkit/fileapi/file_system_database_test_helper.h',
'../webkit/fileapi/file_system_directory_database_unittest.cc',
@@ -356,6 +394,16 @@
'../webkit/media/test_response_generator.h',
'../webkit/mocks/mock_weburlloader.cc',
'../webkit/mocks/mock_weburlloader.h',
+ '../webkit/quota/mock_quota_manager.cc',
+ '../webkit/quota/mock_quota_manager.h',
+ '../webkit/quota/mock_quota_manager_unittest.cc',
+ '../webkit/quota/mock_special_storage_policy.cc',
+ '../webkit/quota/mock_special_storage_policy.h',
+ '../webkit/quota/mock_storage_client.cc',
+ '../webkit/quota/mock_storage_client.h',
+ '../webkit/quota/quota_database_unittest.cc',
+ '../webkit/quota/quota_manager_unittest.cc',
+ '../webkit/quota/quota_temporary_storage_evictor_unittest.cc',
],
'conditions': [
['enable_webrtc==1', {
diff --git a/webkit/appcache/appcache_group_unittest.cc b/webkit/appcache/appcache_group_unittest.cc
index 4fc86d8..a8459e3 100644
--- a/webkit/appcache/appcache_group_unittest.cc
+++ b/webkit/appcache/appcache_group_unittest.cc
@@ -1,9 +1,10 @@
-// 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 <string>
+#include "base/message_loop.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/appcache/appcache.h"
#include "webkit/appcache/appcache_group.h"
@@ -95,9 +96,11 @@ class TestAppCacheHost : public AppCacheHost {
};
class AppCacheGroupTest : public testing::Test {
+ private:
+ MessageLoop message_loop_;
};
-TEST(AppCacheGroupTest, AddRemoveCache) {
+TEST_F(AppCacheGroupTest, AddRemoveCache) {
MockAppCacheService service;
scoped_refptr<AppCacheGroup> group(
new AppCacheGroup(&service, GURL("http://foo.com"), 111));
@@ -166,7 +169,7 @@ TEST(AppCacheGroupTest, AddRemoveCache) {
EXPECT_FALSE(group->newest_complete_cache()); // newest removed
}
-TEST(AppCacheGroupTest, CleanupUnusedGroup) {
+TEST_F(AppCacheGroupTest, CleanupUnusedGroup) {
MockAppCacheService service;
TestAppCacheFrontend frontend;
AppCacheGroup* group =
@@ -207,7 +210,7 @@ TEST(AppCacheGroupTest, CleanupUnusedGroup) {
EXPECT_EQ(frontend.last_status_, appcache::UNCACHED);
}
-TEST(AppCacheGroupTest, StartUpdate) {
+TEST_F(AppCacheGroupTest, StartUpdate) {
MockAppCacheService service;
scoped_refptr<AppCacheGroup> group(
new AppCacheGroup(&service, GURL("http://foo.com"), 111));
@@ -228,7 +231,7 @@ TEST(AppCacheGroupTest, StartUpdate) {
EXPECT_EQ(AppCacheGroup::IDLE, group->update_status());
}
-TEST(AppCacheGroupTest, CancelUpdate) {
+TEST_F(AppCacheGroupTest, CancelUpdate) {
MockAppCacheService service;
scoped_refptr<AppCacheGroup> group(
new AppCacheGroup(&service, GURL("http://foo.com"), 111));
@@ -247,7 +250,7 @@ TEST(AppCacheGroupTest, CancelUpdate) {
EXPECT_FALSE(observer.group_has_cache_);
}
-TEST(AppCacheGroupTest, QueueUpdate) {
+TEST_F(AppCacheGroupTest, QueueUpdate) {
MockAppCacheService service;
scoped_refptr<AppCacheGroup> group(
new AppCacheGroup(&service, GURL("http://foo.com"), 111));
diff --git a/webkit/appcache/appcache_host_unittest.cc b/webkit/appcache/appcache_host_unittest.cc
index fd4a3f3..32b569b 100644
--- a/webkit/appcache/appcache_host_unittest.cc
+++ b/webkit/appcache/appcache_host_unittest.cc
@@ -5,6 +5,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop.h"
#include "net/url_request/url_request.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/appcache/appcache.h"
@@ -137,6 +138,8 @@ class AppCacheHostTest : public testing::Test {
last_callback_param_ = param;
}
+ MessageLoop message_loop_;
+
// Mock classes for the 'host' to work with
MockAppCacheService service_;
MockFrontend mock_frontend_;
diff --git a/webkit/appcache/appcache_quota_client_unittest.cc b/webkit/appcache/appcache_quota_client_unittest.cc
index ca98fc3..e86aeef4 100644
--- a/webkit/appcache/appcache_quota_client_unittest.cc
+++ b/webkit/appcache/appcache_quota_client_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.
@@ -154,6 +154,7 @@ class AppCacheQuotaClientTest : public testing::Test {
delete_status_ = status;
}
+ MessageLoop message_loop_;
int64 usage_;
std::set<GURL> origins_;
quota::StorageType type_;
diff --git a/webkit/appcache/appcache_service_unittest.cc b/webkit/appcache/appcache_service_unittest.cc
index 4397c6f..4a78396 100644
--- a/webkit/appcache/appcache_service_unittest.cc
+++ b/webkit/appcache/appcache_service_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.
@@ -175,6 +175,9 @@ class AppCacheServiceTest : public testing::Test {
int delete_result_;
int delete_completion_count_;
net::CompletionCallback deletion_callback_;
+
+ private:
+ MessageLoop message_loop_;
};
TEST_F(AppCacheServiceTest, DeleteAppCachesForOrigin) {
diff --git a/webkit/appcache/mock_appcache_storage_unittest.cc b/webkit/appcache/mock_appcache_storage_unittest.cc
index cc37ef4..3ac8543 100644
--- a/webkit/appcache/mock_appcache_storage_unittest.cc
+++ b/webkit/appcache/mock_appcache_storage_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.
@@ -71,6 +71,9 @@ class MockAppCacheStorageTest : public testing::Test {
int64 found_cache_id_;
GURL found_manifest_url_;
};
+
+ private:
+ MessageLoop message_loop_;
};
@@ -619,4 +622,3 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseExclusions) {
}
} // namespace appcache
-
diff --git a/webkit/blob/shareable_file_reference_unittest.cc b/webkit/blob/shareable_file_reference_unittest.cc
index 966a3a6..6234f42 100644
--- a/webkit/blob/shareable_file_reference_unittest.cc
+++ b/webkit/blob/shareable_file_reference_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.
@@ -13,6 +13,7 @@
namespace webkit_blob {
TEST(ShareableFileReferenceTest, TestReferences) {
+ MessageLoop message_loop;
scoped_refptr<base::MessageLoopProxy> loop_proxy =
base::MessageLoopProxy::current();
ScopedTempDir temp_dir;
diff --git a/webkit/database/database_connections_unittest.cc b/webkit/database/database_connections_unittest.cc
index 0056dac..d0deb31 100644
--- a/webkit/database/database_connections_unittest.cc
+++ b/webkit/database/database_connections_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.
@@ -100,6 +100,7 @@ TEST(DatabaseConnectionsTest, DatabaseConnectionsWrapperTest) {
const string16 kOriginId(ASCIIToUTF16("origin_id"));
const string16 kName(ASCIIToUTF16("database_name"));
+ MessageLoop message_loop;
scoped_refptr<DatabaseConnectionsWrapper> obj(
new DatabaseConnectionsWrapper);
EXPECT_FALSE(obj->HasOpenConnections());
diff --git a/webkit/database/database_quota_client_unittest.cc b/webkit/database/database_quota_client_unittest.cc
index 0a178f1..0de5359 100644
--- a/webkit/database/database_quota_client_unittest.cc
+++ b/webkit/database/database_quota_client_unittest.cc
@@ -201,6 +201,7 @@ class DatabaseQuotaClientTest : public testing::Test {
delete_status_ = status;
}
+ MessageLoop message_loop_;
int64 usage_;
std::set<GURL> origins_;
quota::StorageType type_;
diff --git a/webkit/database/database_tracker_unittest.cc b/webkit/database/database_tracker_unittest.cc
index a80ca42..303dbd8 100644
--- a/webkit/database/database_tracker_unittest.cc
+++ b/webkit/database/database_tracker_unittest.cc
@@ -5,6 +5,7 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop.h"
#include "base/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/scoped_temp_dir.h"
@@ -539,6 +540,7 @@ class DatabaseTracker_TestHelper_Test {
const string16 kDescription = ASCIIToUTF16("database_description");
// Initialize the tracker database.
+ MessageLoop message_loop;
ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
FilePath origin1_db_dir;
@@ -616,6 +618,7 @@ class DatabaseTracker_TestHelper_Test {
const string16 kDescription = ASCIIToUTF16("database_description");
// Initialize the tracker database.
+ MessageLoop message_loop;
ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
FilePath origin1_db_dir;
diff --git a/webkit/dom_storage/dom_storage_area_unittest.cc b/webkit/dom_storage/dom_storage_area_unittest.cc
index 858eb23..f9d4284 100644
--- a/webkit/dom_storage/dom_storage_area_unittest.cc
+++ b/webkit/dom_storage/dom_storage_area_unittest.cc
@@ -63,6 +63,9 @@ class DomStorageAreaTest : public testing::Test {
EXPECT_EQ(kValue, values[kKey].string());
}
};
+
+ private:
+ MessageLoop message_loop_;
};
TEST_F(DomStorageAreaTest, DomStorageAreaBasics) {
diff --git a/webkit/dom_storage/dom_storage_context_unittest.cc b/webkit/dom_storage/dom_storage_context_unittest.cc
index 4549fb5..401cc87 100644
--- a/webkit/dom_storage/dom_storage_context_unittest.cc
+++ b/webkit/dom_storage/dom_storage_context_unittest.cc
@@ -62,6 +62,7 @@ class DomStorageContextTest : public testing::Test {
}
protected:
+ MessageLoop message_loop_;
ScopedTempDir temp_dir_;
scoped_refptr<quota::MockSpecialStoragePolicy> storage_policy_;
scoped_refptr<MockDomStorageTaskRunner> task_runner_;
diff --git a/webkit/quota/mock_quota_manager_unittest.cc b/webkit/quota/mock_quota_manager_unittest.cc
index 30229af..c606902 100644
--- a/webkit/quota/mock_quota_manager_unittest.cc
+++ b/webkit/quota/mock_quota_manager_unittest.cc
@@ -98,6 +98,7 @@ class MockQuotaManagerTest : public testing::Test {
}
private:
+ MessageLoop message_loop_;
ScopedTempDir data_dir_;
base::WeakPtrFactory<MockQuotaManagerTest> weak_factory_;
scoped_refptr<MockQuotaManager> manager_;
diff --git a/webkit/quota/quota_database_unittest.cc b/webkit/quota/quota_database_unittest.cc
index bded97f..cc083c1 100644
--- a/webkit/quota/quota_database_unittest.cc
+++ b/webkit/quota/quota_database_unittest.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/file_util.h"
+#include "base/message_loop.h"
#include "base/scoped_temp_dir.h"
#include "googleurl/src/gurl.h"
#include "sql/connection.h"
@@ -480,6 +481,8 @@ class QuotaDatabaseTest : public testing::Test {
AssignQuotaTable(db.get(), entries, entries + entries_size);
db->CommitTransaction();
}
+
+ MessageLoop message_loop_;
};
TEST_F(QuotaDatabaseTest, LazyOpen) {
diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc
index 9c0136f..171f6b4 100644
--- a/webkit/quota/quota_manager_unittest.cc
+++ b/webkit/quota/quota_manager_unittest.cc
@@ -399,6 +399,7 @@ class QuotaManagerTest : public testing::Test {
return base::Time::FromDoubleT(mock_time_counter_ * 10.0);
}
+ MessageLoop message_loop_;
ScopedTempDir data_dir_;
base::WeakPtrFactory<QuotaManagerTest> weak_factory_;
diff --git a/webkit/quota/quota_temporary_storage_evictor_unittest.cc b/webkit/quota/quota_temporary_storage_evictor_unittest.cc
index 9e28721..1d6bf92 100644
--- a/webkit/quota/quota_temporary_storage_evictor_unittest.cc
+++ b/webkit/quota/quota_temporary_storage_evictor_unittest.cc
@@ -222,6 +222,7 @@ class QuotaTemporaryStorageEvictorTest : public testing::Test {
reset_min_available_disk_space_to_start_eviction();
}
+ MessageLoop message_loop_;
scoped_ptr<MockQuotaEvictionHandler> quota_eviction_handler_;
scoped_ptr<QuotaTemporaryStorageEvictor> temporary_storage_evictor_;
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index c2b3f31..27997c0 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -364,46 +364,10 @@
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_user_agent',
],
'sources': [
- '../../appcache/manifest_parser_unittest.cc',
- '../../appcache/appcache_unittest.cc',
- '../../appcache/appcache_database_unittest.cc',
- '../../appcache/appcache_group_unittest.cc',
- '../../appcache/appcache_host_unittest.cc',
- '../../appcache/appcache_quota_client_unittest.cc',
- '../../appcache/appcache_request_handler_unittest.cc',
- '../../appcache/appcache_response_unittest.cc',
- '../../appcache/appcache_service_unittest.cc',
- '../../appcache/appcache_storage_unittest.cc',
- '../../appcache/appcache_storage_impl_unittest.cc',
- '../../appcache/appcache_update_job_unittest.cc',
- '../../appcache/appcache_url_request_job_unittest.cc',
- '../../appcache/mock_appcache_policy.h',
- '../../appcache/mock_appcache_policy.cc',
- '../../appcache/mock_appcache_service.cc',
- '../../appcache/mock_appcache_service.h',
- '../../appcache/mock_appcache_storage.cc',
- '../../appcache/mock_appcache_storage.h',
- '../../appcache/mock_appcache_storage_unittest.cc',
- '../../blob/blob_storage_controller_unittest.cc',
- '../../blob/blob_url_request_job_unittest.cc',
- '../../blob/shareable_file_reference_unittest.cc',
- '../../database/database_connections_unittest.cc',
- '../../database/database_quota_client_unittest.cc',
- '../../database/databases_table_unittest.cc',
- '../../database/database_tracker_unittest.cc',
- '../../database/database_util_unittest.cc',
- '../../database/quota_table_unittest.cc',
- '../../dom_storage/dom_storage_area_unittest.cc',
- '../../dom_storage/dom_storage_cached_area_unittest.cc',
- '../../dom_storage/dom_storage_context_unittest.cc',
- '../../dom_storage/dom_storage_database_unittest.cc',
- '../../dom_storage/dom_storage_map_unittest.cc',
- '../../dom_storage/session_storage_database_unittest.cc',
'../../glue/bookmarklet_unittest.cc',
'../../glue/cpp_bound_class_unittest.cc',
'../../glue/cpp_variant_unittest.cc',
@@ -437,16 +401,6 @@
'../../plugins/ppapi/quota_file_io_unittest.cc',
'../../plugins/ppapi/time_conversion_unittest.cc',
'../../plugins/ppapi/url_request_info_unittest.cc',
- '../../quota/mock_quota_manager.cc',
- '../../quota/mock_quota_manager.h',
- '../../quota/mock_quota_manager_unittest.cc',
- '../../quota/mock_special_storage_policy.cc',
- '../../quota/mock_special_storage_policy.h',
- '../../quota/mock_storage_client.cc',
- '../../quota/mock_storage_client.h',
- '../../quota/quota_database_unittest.cc',
- '../../quota/quota_manager_unittest.cc',
- '../../quota/quota_temporary_storage_evictor_unittest.cc',
'../webcore_unit_tests/BMPImageDecoder_unittest.cpp',
'../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
'image_decoder_unittest.cc',
generated by cgit v1.1 at 2025-02-15 04:46:19 +0000