[Sync] Revamp and re-enable themes/extensions sync integration tests

chrome/test/live_sync/two_client_live_themes_sync_test.cc

Index: chrome/test/live_sync/two_client_live_themes_sync_test.cc
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 da5545d357e356f235f68baebb7577747f932b62..a8197a7e2b12d00a3e29d44384cbdf8ef22c7273 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
@@ -3,9 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/test/live_sync/live_themes_sync_test.h"
 
 class TwoClientLiveThemesSyncTest : public LiveThemesSyncTest {
@@ -24,39 +22,38 @@ class TwoClientLiveThemesSyncTest : public LiveThemesSyncTest {
 IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomTheme) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  ASSERT_EQ(NULL, GetCustomTheme(GetProfile(0)));
-  ASSERT_EQ(NULL, GetCustomTheme(GetProfile(1)));
-  ASSERT_EQ(NULL, GetCustomTheme(verifier()));
+  ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
+  ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
+  ASSERT_FALSE(UsingCustomTheme(verifier()));
 
-  SetTheme(GetProfile(0), GetTheme(0));
-  SetTheme(verifier(), GetTheme(0));
-  ASSERT_EQ(GetTheme(0), GetCustomTheme(GetProfile(0)));
-  ASSERT_EQ(NULL, GetCustomTheme(GetProfile(1)));
-  ASSERT_EQ(GetTheme(0), GetCustomTheme(verifier()));
+  UseCustomTheme(GetProfile(0), 0);
+  UseCustomTheme(verifier(), 0);
+  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
+  ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
-  ASSERT_EQ(GetTheme(0), GetCustomTheme(GetProfile(0)));
+  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
+  ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
   // TODO(akalin): Add functions to simulate when a pending extension
   // is installed as well as when a pending extension fails to
   // install.
-  ASSERT_TRUE(ExtensionIsPendingInstall(GetProfile(1), GetTheme(0)));
-  ASSERT_EQ(GetTheme(0), GetCustomTheme(verifier()));
+  ASSERT_TRUE(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0)));
+  ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeTheme) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  SetTheme(GetProfile(0), GetTheme(0));
-  SetTheme(GetProfile(1), GetTheme(0));
-  SetTheme(verifier(), GetTheme(0));
+  UseCustomTheme(GetProfile(0), 0);
+  UseCustomTheme(GetProfile(1), 0);
+  UseCustomTheme(verifier(), 0);
 
   ASSERT_TRUE(AwaitQuiescence());
 
-  SetNativeTheme(GetProfile(0));
-  SetNativeTheme(verifier());
+  UseNativeTheme(GetProfile(0));
+  UseNativeTheme(verifier());
   ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
-  ASSERT_FALSE(UsingNativeTheme(GetProfile(1)));
   ASSERT_TRUE(UsingNativeTheme(verifier()));
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -69,16 +66,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeTheme) {
 IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, DefaultTheme) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  SetTheme(GetProfile(0), GetTheme(0));
-  SetTheme(GetProfile(1), GetTheme(0));
-  SetTheme(verifier(), GetTheme(0));
+  UseCustomTheme(GetProfile(0), 0);
+  UseCustomTheme(GetProfile(1), 0);
+  UseCustomTheme(verifier(), 0);
 
   ASSERT_TRUE(AwaitQuiescence());
 
   UseDefaultTheme(GetProfile(0));
   UseDefaultTheme(verifier());
   ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
-  ASSERT_FALSE(UsingDefaultTheme(GetProfile(1)));
   ASSERT_TRUE(UsingDefaultTheme(verifier()));
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -91,7 +87,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, DefaultTheme) {
 IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeDefaultRace) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  SetNativeTheme(GetProfile(0));
+  UseNativeTheme(GetProfile(0));
   UseDefaultTheme(GetProfile(1));
   ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
   ASSERT_TRUE(UsingDefaultTheme(GetProfile(1)));
@@ -110,9 +106,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeDefaultRace) {
 IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomNativeRace) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  SetTheme(GetProfile(0), GetTheme(0));
-  SetNativeTheme(GetProfile(1));
-  ASSERT_EQ(GetTheme(0), GetCustomTheme(GetProfile(0)));
+  UseCustomTheme(GetProfile(0), 0);
+  UseNativeTheme(GetProfile(1));
+  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
   ASSERT_TRUE(UsingNativeTheme(GetProfile(1)));
 
   ASSERT_TRUE(AwaitQuiescence());
@@ -120,22 +116,22 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomNativeRace) {
   // TODO(akalin): Add function to wait for pending extensions to be
   // installed.
 
-  ASSERT_EQ(HasOrWillHaveCustomTheme(GetProfile(0), GetTheme(0)),
-            HasOrWillHaveCustomTheme(GetProfile(1), GetTheme(0)));
+  ASSERT_EQ(HasOrWillHaveCustomTheme(GetProfile(0), GetCustomTheme(0)),
+            HasOrWillHaveCustomTheme(GetProfile(1), GetCustomTheme(0)));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomDefaultRace) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
-  SetTheme(GetProfile(0), GetTheme(0));
+  UseCustomTheme(GetProfile(0), 0);
   UseDefaultTheme(GetProfile(1));
-  ASSERT_EQ(GetTheme(0), GetCustomTheme(GetProfile(0)));
+  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
   ASSERT_TRUE(UsingDefaultTheme(GetProfile(1)));
 
   ASSERT_TRUE(AwaitQuiescence());
 
-  ASSERT_EQ(HasOrWillHaveCustomTheme(GetProfile(0), GetTheme(0)),
-            HasOrWillHaveCustomTheme(GetProfile(1), GetTheme(0)));
+  ASSERT_EQ(HasOrWillHaveCustomTheme(GetProfile(0), GetCustomTheme(0)),
+            HasOrWillHaveCustomTheme(GetProfile(1), GetCustomTheme(0)));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomCustomRace) {
@@ -143,19 +139,19 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomCustomRace) {
 
   // TODO(akalin): Generalize this to n clients.
 
-  SetTheme(GetProfile(0), GetTheme(0));
-  SetTheme(GetProfile(1), GetTheme(1));
-  ASSERT_EQ(GetTheme(0), GetCustomTheme(GetProfile(0)));
-  ASSERT_EQ(GetTheme(1), GetCustomTheme(GetProfile(1)));
+  UseCustomTheme(GetProfile(0), 0);
+  UseCustomTheme(GetProfile(1), 1);
+  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
+  ASSERT_EQ(GetCustomTheme(1), GetThemeID(GetProfile(1)));
 
   ASSERT_TRUE(AwaitQuiescence());
 
   bool using_theme_0 =
-      (GetCustomTheme(GetProfile(0)) == GetTheme(0)) &&
-      HasOrWillHaveCustomTheme(GetProfile(1), GetTheme(0));
+      (GetThemeID(GetProfile(0)) == GetCustomTheme(0)) &&
+      HasOrWillHaveCustomTheme(GetProfile(1), GetCustomTheme(0));
   bool using_theme_1 =
-      HasOrWillHaveCustomTheme(GetProfile(0), GetTheme(1)) &&
-      (GetCustomTheme(GetProfile(1)) == GetTheme(1));
+      HasOrWillHaveCustomTheme(GetProfile(0), GetCustomTheme(1)) &&
+      (GetThemeID(GetProfile(1)) == GetCustomTheme(1));
 
   // Equivalent to using_theme_0 xor using_theme_1.
   ASSERT_NE(using_theme_0, using_theme_1);