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

5 files changed, 22 insertions, 10 deletions

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
-