Only invoke WebKit methods in browsing data helpers on the WEBKIT thread.

BUG=71786
TEST=browser & unit tests

Review URL: http://codereview.chromium.org/6246105

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

1 files changed, 2 insertions, 86 deletions

diff --git a/chrome/browser/browsing_data_database_helper_unittest.cc b/chrome/browser/browsing_data_database_helper_unittest.cc
index ca23f39..75442ad 100644
--- a/chrome/browser/browsing_data_database_helper_unittest.cc
+++ b/chrome/browser/browsing_data_database_helper_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -9,91 +9,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-class TestCompletionCallback {
- public:
-  TestCompletionCallback()
-      : have_result_(false) {
-  }
-
-  bool have_result() const { return have_result_; }
-
-  const std::vector<BrowsingDataDatabaseHelper::DatabaseInfo>& result() {
-    return result_;
-  }
-
-  void callback(const std::vector<
-          BrowsingDataDatabaseHelper::DatabaseInfo>& info) {
-    have_result_ = true;
-    result_ = info;
-  }
-
- private:
-  bool have_result_;
-  std::vector<BrowsingDataDatabaseHelper::DatabaseInfo> result_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestCompletionCallback);
-};
-}  // namespace
-
-TEST(CannedBrowsingDataDatabaseTest, AddDatabase) {
-  TestingProfile profile;
-
-  const GURL origin1("http://host1:1/");
-  const GURL origin2("http://host2:1/");
-  const char origin_str1[] = "http_host1_1";
-  const char origin_str2[] = "http_host2_1";
-  const char db1[] = "db1";
-  const char db2[] = "db2";
-  const char db3[] = "db3";
-
-  scoped_refptr<CannedBrowsingDataDatabaseHelper> helper(
-      new CannedBrowsingDataDatabaseHelper(&profile));
-  helper->AddDatabase(origin1, db1, "");
-  helper->AddDatabase(origin1, db2, "");
-  helper->AddDatabase(origin2, db3, "");
-
-  TestCompletionCallback callback;
-  helper->StartFetching(
-      NewCallback(&callback, &TestCompletionCallback::callback));
-  ASSERT_TRUE(callback.have_result());
-
-  std::vector<BrowsingDataDatabaseHelper::DatabaseInfo> result =
-      callback.result();
-
-  ASSERT_EQ(3u, result.size());
-  EXPECT_STREQ(origin_str1, result[0].origin_identifier.c_str());
-  EXPECT_STREQ(db1, result[0].database_name.c_str());
-  EXPECT_STREQ(origin_str1, result[1].origin_identifier.c_str());
-  EXPECT_STREQ(db2, result[1].database_name.c_str());
-  EXPECT_STREQ(origin_str2, result[2].origin_identifier.c_str());
-  EXPECT_STREQ(db3, result[2].database_name.c_str());
-}
-
-TEST(CannedBrowsingDataDatabaseTest, Unique) {
-  TestingProfile profile;
-
-  const GURL origin("http://host1:1/");
-  const char origin_str[] = "http_host1_1";
-  const char db[] = "db1";
-
-  scoped_refptr<CannedBrowsingDataDatabaseHelper> helper(
-      new CannedBrowsingDataDatabaseHelper(&profile));
-  helper->AddDatabase(origin, db, "");
-  helper->AddDatabase(origin, db, "");
-
-  TestCompletionCallback callback;
-  helper->StartFetching(
-      NewCallback(&callback, &TestCompletionCallback::callback));
-  ASSERT_TRUE(callback.have_result());
-
-  std::vector<BrowsingDataDatabaseHelper::DatabaseInfo> result =
-      callback.result();
-
-  ASSERT_EQ(1u, result.size());
-  EXPECT_STREQ(origin_str, result[0].origin_identifier.c_str());
-  EXPECT_STREQ(db, result[0].database_name.c_str());
-}
-
 TEST(CannedBrowsingDataDatabaseTest, Empty) {
   TestingProfile profile;
 
@@ -109,3 +24,4 @@ TEST(CannedBrowsingDataDatabaseTest, Empty) {
   helper->Reset();
   ASSERT_TRUE(helper->empty());
 }
+}  // namespace