From 583844c2df50f0f2188aab7eed3fbcc40e499511 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Sat, 27 Aug 2011 00:38:35 +0000 Subject: Switch ChromeTestSuite to the same convention as ContentTestSuite: the test suite implicitly provides global resources for each test, but they're re-initialized between each test. The performance overhead is negligible. We need that to continue moving tests from unit_tests to content_unittests. Because of shared test fixtures the test suites need to be compatible. BUG=90443 Review URL: http://codereview.chromium.org/7744039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98526 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/webdata/autofill_table_unittest.cc | 3 +-- chrome/browser/webdata/web_data_service_unittest.cc | 3 +-- chrome/browser/webdata/web_database_migration_unittest.cc | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'chrome/browser/webdata') diff --git a/chrome/browser/webdata/autofill_table_unittest.cc b/chrome/browser/webdata/autofill_table_unittest.cc index eec2f21..ca37e70 100644 --- a/chrome/browser/webdata/autofill_table_unittest.cc +++ b/chrome/browser/webdata/autofill_table_unittest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/webdata/web_database.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/guid.h" -#include "chrome/test/base/testing_browser_process_test.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/form_field.h" @@ -82,7 +81,7 @@ bool CompareAutofillEntries(const AutofillEntry& a, const AutofillEntry& b) { } // anonymous namespace -class AutofillTableTest : public TestingBrowserProcessTest { +class AutofillTableTest : public testing::Test { public: AutofillTableTest() {} virtual ~AutofillTableTest() {} diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index 33fc6e0..786c4b8 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -27,7 +27,6 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/guid.h" -#include "chrome/test/base/testing_browser_process_test.h" #include "chrome/test/base/thread_observer_helper.h" #include "content/browser/browser_thread.h" #include "content/common/notification_details.h" @@ -68,7 +67,7 @@ class AutofillDBThreadObserverHelper : public DBThreadObserverHelper { } }; -class WebDataServiceTest : public TestingBrowserProcessTest { +class WebDataServiceTest : public testing::Test { public: WebDataServiceTest() : ui_thread_(BrowserThread::UI, &message_loop_), diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc index 7acf56e..e6e7355 100644 --- a/chrome/browser/webdata/web_database_migration_unittest.cc +++ b/chrome/browser/webdata/web_database_migration_unittest.cc @@ -20,7 +20,6 @@ #include "chrome/browser/webdata/web_database.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/guid.h" -#include "chrome/test/base/testing_browser_process_test.h" #include "chrome/test/base/ui_test_utils.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" @@ -128,7 +127,7 @@ void CreditCard32FromStatement(const sql::Statement& s, // Specifically, these tests are intended to exercise any schema changes in // the WebDatabase and data migrations that occur in // |WebDatabase::MigrateOldVersionsAsNeeded()|. -class WebDatabaseMigrationTest : public TestingBrowserProcessTest { +class WebDatabaseMigrationTest : public testing::Test { public: WebDatabaseMigrationTest() {} virtual ~WebDatabaseMigrationTest() {} -- cgit v1.1