diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 00:59:08 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 00:59:08 +0000 |
| commit | ddeab8cb9bea22ce9fe0da2498433d722041dee3 (patch) | |
| tree | 692ab9b68f53a2f8d8d81cef06165a0ffb17dd44 /chrome/test | |
| parent | 491328e2de2e7b6b405943f676166e72b2a77784 (diff) | |
| download | chromium_src-ddeab8cb9bea22ce9fe0da2498433d722041dee3.zip chromium_src-ddeab8cb9bea22ce9fe0da2498433d722041dee3.tar.gz chromium_src-ddeab8cb9bea22ce9fe0da2498433d722041dee3.tar.bz2 | |
Made HostZoomMap be deleted on the UI thread
This fixes some DCHECKs in the themes sync integration tests.
Re-enable themes sync integration tests.
BUG=62779
TEST=themes sync integration tests
Review URL: http://codereview.chromium.org/4835001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/live_sync/single_client_live_themes_sync_test.cc | 6 | ||||
| -rw-r--r-- | chrome/test/live_sync/two_client_live_themes_sync_test.cc | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/chrome/test/live_sync/single_client_live_themes_sync_test.cc b/chrome/test/live_sync/single_client_live_themes_sync_test.cc index 8642aca..f8cef03 100644 --- a/chrome/test/live_sync/single_client_live_themes_sync_test.cc +++ b/chrome/test/live_sync/single_client_live_themes_sync_test.cc @@ -39,8 +39,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, CustomTheme) { ASSERT_EQ(theme, GetCustomTheme(verifier())); } -// TODO(akalin): Re-enable this after http://crbug.com/62779 is fixed. -IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, FAILS_NativeTheme) { +IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, NativeTheme) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; scoped_refptr<Extension> theme = GetTheme(0); @@ -64,8 +63,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, FAILS_NativeTheme) { ASSERT_TRUE(UsingNativeTheme(verifier())); } -// TODO(akalin): Re-enable this after http://crbug.com/62779 is fixed. -IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, FAILS_DefaultTheme) { +IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, DefaultTheme) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; scoped_refptr<Extension> theme = GetTheme(0); diff --git a/chrome/test/live_sync/two_client_live_themes_sync_test.cc b/chrome/test/live_sync/two_client_live_themes_sync_test.cc index 57201c5..c9db7b9 100644 --- a/chrome/test/live_sync/two_client_live_themes_sync_test.cc +++ b/chrome/test/live_sync/two_client_live_themes_sync_test.cc @@ -44,8 +44,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomTheme) { ASSERT_EQ(theme, GetCustomTheme(verifier())); } -// TODO(akalin): Re-enable this after http://crbug.com/62779 is fixed. -IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, FAILS_NativeTheme) { +IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeTheme) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; scoped_refptr<Extension> theme = GetTheme(0); @@ -68,8 +67,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, FAILS_NativeTheme) { ASSERT_TRUE(UsingNativeTheme(verifier())); } -// TODO(akalin): Re-enable this after http://crbug.com/62779 is fixed. -IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, FAILS_DefaultTheme) { +IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, DefaultTheme) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; scoped_refptr<Extension> theme = GetTheme(0); |