From b7c64d66e61a88bd308bb367553c413bdb34bf44 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Thu, 11 Aug 2011 00:08:04 +0000 Subject: GTTF: Use a fresh TestingBrowserProcess for each test, part #5 For a detailed description see part #1, http://codereview.chromium.org/6478005/ This CL fixes the bug fully on Windows. More platforms will follow. BUG=61062 TEST=unit_tests, possibly more Review URL: http://codereview.chromium.org/7601006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96269 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/browsing_data_database_helper_browsertest.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'chrome/browser/browsing_data_database_helper_browsertest.cc') diff --git a/chrome/browser/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data_database_helper_browsertest.cc index 39699f6..462e697 100644 --- a/chrome/browser/browsing_data_database_helper_browsertest.cc +++ b/chrome/browser/browsing_data_database_helper_browsertest.cc @@ -6,8 +6,9 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browsing_data_database_helper.h" #include "chrome/browser/browsing_data_helper_browsertest.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" -#include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/browser_thread.h" @@ -24,7 +25,7 @@ class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest { public: virtual void CreateDatabases() { webkit_database::DatabaseTracker* db_tracker = - testing_profile_.GetDatabaseTracker(); + browser()->profile()->GetDatabaseTracker(); string16 db_name = ASCIIToUTF16("db"); string16 description = ASCIIToUTF16("db_description"); int64 size; @@ -46,9 +47,6 @@ class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest { db_tracker->GetAllOriginsInfo(&origins); ASSERT_EQ(2U, origins.size()); } - - protected: - TestingProfile testing_profile_; }; // Called back by BrowsingDataDatabaseHelper on the UI thread once the database @@ -77,7 +75,7 @@ class StopTestOnCallback { IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, FetchData) { CreateDatabases(); scoped_refptr database_helper( - new BrowsingDataDatabaseHelper(&testing_profile_)); + new BrowsingDataDatabaseHelper(browser()->profile())); StopTestOnCallback stop_test_on_callback(database_helper); database_helper->StartFetching( NewCallback(&stop_test_on_callback, &StopTestOnCallback::Callback)); @@ -95,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, CannedAddDatabase) { const char db3[] = "db3"; scoped_refptr helper( - new CannedBrowsingDataDatabaseHelper(&testing_profile_)); + new CannedBrowsingDataDatabaseHelper(browser()->profile())); helper->AddDatabase(origin1, db1, ""); helper->AddDatabase(origin1, db2, ""); helper->AddDatabase(origin2, db3, ""); @@ -122,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, CannedUnique) { const char db[] = "db1"; scoped_refptr helper( - new CannedBrowsingDataDatabaseHelper(&testing_profile_)); + new CannedBrowsingDataDatabaseHelper(browser()->profile())); helper->AddDatabase(origin, db, ""); helper->AddDatabase(origin, db, ""); -- cgit v1.1