Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3556)

Unified Diff: chrome/browser/sync/test/integration/two_client_themes_sync_test.cc

Issue 2799003002: Unpack theme data from extensions off of UI thread. (Closed)
Patch Set: fix gtk case Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
index 530f2092e7850971d50e88d64ac2893a84bf5aad..68beb142aa41ec36050cd17ab83828ee2c84480c 100644
--- a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
@@ -38,7 +38,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest,
ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
- UseCustomTheme(GetProfile(0), 0);
+ SetCustomTheme(GetProfile(0));
ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
// TODO(sync): Add functions to simulate when a pending extension
@@ -57,8 +57,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest,
E2E_ENABLED(CustomThenSyncNative)) {
ASSERT_TRUE(SetupClients());
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(GetProfile(1), 0);
+ SetCustomTheme(GetProfile(0));
+ SetCustomTheme(GetProfile(1));
ASSERT_TRUE(SetupSync());
@@ -77,8 +77,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest,
E2E_ENABLED(CustomThenSyncDefault)) {
ASSERT_TRUE(SetupClients());
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(GetProfile(1), 0);
+ SetCustomTheme(GetProfile(0));
+ SetCustomTheme(GetProfile(1));
ASSERT_TRUE(SetupSync());
@@ -97,7 +97,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, E2E_ENABLED(CycleOptions)) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- UseCustomTheme(GetProfile(0), 0);
+ SetCustomTheme(GetProfile(0));
ASSERT_TRUE(
ThemePendingInstallChecker(GetProfile(1), GetCustomTheme(0)).Wait());
@@ -115,7 +115,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, E2E_ENABLED(CycleOptions)) {
EXPECT_TRUE(UsingDefaultTheme(GetProfile(0)));
EXPECT_TRUE(UsingDefaultTheme(GetProfile(1)));
- UseCustomTheme(GetProfile(0), 1);
+ SetCustomTheme(GetProfile(0), 1);
ASSERT_TRUE(
ThemePendingInstallChecker(GetProfile(1), GetCustomTheme(1)).Wait());
EXPECT_EQ(GetCustomTheme(1), GetThemeID(GetProfile(0)));
« no previous file with comments | « chrome/browser/sync/test/integration/sync_integration_test_util.cc ('k') | chrome/browser/themes/browser_theme_pack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698