summaryrefslogtreecommitdiffstats
path: root/webkit/database
diff options
context:
space:
mode:
authoradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 00:57:16 +0000
committeradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 00:57:16 +0000
commit81b919c7669f3ab92e55e415595bdaa131010fd4 (patch)
tree7c706bc7a9408463b7d9455583da8e322ff2c4a6 /webkit/database
parent23cf9bd77696ac52ef7b3c9f61d6ad6e8528f5ea (diff)
downloadchromium_src-81b919c7669f3ab92e55e415595bdaa131010fd4.zip
chromium_src-81b919c7669f3ab92e55e415595bdaa131010fd4.tar.gz
chromium_src-81b919c7669f3ab92e55e415595bdaa131010fd4.tar.bz2
Move remaining webkit storage unit tests to content_unittests
This includes appcache, blob, database, dom_storage, and quota. Many tests needed MessageLoops, which I've added as appropriate. Review URL: https://chromiumcodereview.appspot.com/10540042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/database')
-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
3 files changed, 6 insertions, 1 deletions
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;