Rename browser/sync/test/live_sync directory to browser/sync/test/integration

chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc

Index: chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc
diff --git a/chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc b/chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc
deleted file mode 100644
index 2ca7c3fd434ee1e94318d0496d1f4b6e3db2c276..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/test/live_sync/two_client_themes_sync_test.cc
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/basictypes.h"
-#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/live_sync/themes_helper.h"
-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"
-
-using themes_helper::GetCustomTheme;
-using themes_helper::GetThemeID;
-using themes_helper::HasOrWillHaveCustomTheme;
-using themes_helper::ThemeIsPendingInstall;
-using themes_helper::UseCustomTheme;
-using themes_helper::UseDefaultTheme;
-using themes_helper::UseNativeTheme;
-using themes_helper::UsingCustomTheme;
-using themes_helper::UsingDefaultTheme;
-using themes_helper::UsingNativeTheme;
-
-class TwoClientThemesSyncTest : public LiveSyncTest {
- public:
-  TwoClientThemesSyncTest() : LiveSyncTest(TWO_CLIENT) {}
-  virtual ~TwoClientThemesSyncTest() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TwoClientThemesSyncTest);
-};
-
-// TODO(akalin): Add tests for model association (i.e., tests that
-// start with SetupClients(), change the theme state, then call
-// SetupSync()).
-
-// TCM ID - 3667311.
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, CustomTheme) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
-  ASSERT_FALSE(UsingCustomTheme(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(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(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0)));
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-}
-
-// TCM ID - 3599303.
-// TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, FAILS_NativeTheme) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, NativeTheme) {
-#endif  // OS_CHROMEOS
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  UseCustomTheme(GetProfile(0), 0);
-  UseCustomTheme(GetProfile(1), 0);
-  UseCustomTheme(verifier(), 0);
-
-  ASSERT_TRUE(AwaitQuiescence());
-
-  UseNativeTheme(GetProfile(0));
-  UseNativeTheme(verifier());
-  ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
-  ASSERT_TRUE(UsingNativeTheme(verifier()));
-
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
-  ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
-  ASSERT_TRUE(UsingNativeTheme(GetProfile(1)));
-  ASSERT_TRUE(UsingNativeTheme(verifier()));
-}
-
-// TCM ID - 7247455.
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DefaultTheme) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  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_TRUE(UsingDefaultTheme(verifier()));
-
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
-  ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
-  ASSERT_TRUE(UsingDefaultTheme(GetProfile(1)));
-  ASSERT_TRUE(UsingDefaultTheme(verifier()));
-}
-
-// TCM ID - 7292065.
-// TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, FAILS_NativeDefaultRace) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, NativeDefaultRace) {
-#endif  // OS_CHROMEOS
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  UseNativeTheme(GetProfile(0));
-  UseDefaultTheme(GetProfile(1));
-  ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
-  ASSERT_TRUE(UsingDefaultTheme(GetProfile(1)));
-
-  ASSERT_TRUE(AwaitQuiescence());
-
-  // TODO(akalin): Add function that compares two profiles to see if
-  // they're at the same state.
-
-  ASSERT_EQ(UsingNativeTheme(GetProfile(0)),
-            UsingNativeTheme(GetProfile(1)));
-  ASSERT_EQ(UsingDefaultTheme(GetProfile(0)),
-            UsingDefaultTheme(GetProfile(1)));
-}
-
-// TCM ID - 7294077.
-// TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, FAILS_CustomNativeRace) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, CustomNativeRace) {
-#endif  // OS_CHROMEOS
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  UseCustomTheme(GetProfile(0), 0);
-  UseNativeTheme(GetProfile(1));
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
-  ASSERT_TRUE(UsingNativeTheme(GetProfile(1)));
-
-  ASSERT_TRUE(AwaitQuiescence());
-
-  // TODO(akalin): Add function to wait for pending extensions to be
-  // installed.
-
-  ASSERT_EQ(HasOrWillHaveCustomTheme(GetProfile(0), GetCustomTheme(0)),
-            HasOrWillHaveCustomTheme(GetProfile(1), GetCustomTheme(0)));
-}
-
-// TCM ID - 7307225.
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, CustomDefaultRace) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  UseCustomTheme(GetProfile(0), 0);
-  UseDefaultTheme(GetProfile(1));
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
-  ASSERT_TRUE(UsingDefaultTheme(GetProfile(1)));
-
-  ASSERT_TRUE(AwaitQuiescence());
-
-  ASSERT_EQ(HasOrWillHaveCustomTheme(GetProfile(0), GetCustomTheme(0)),
-            HasOrWillHaveCustomTheme(GetProfile(1), GetCustomTheme(0)));
-}
-
-// TCM ID - 7264758.
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, CustomCustomRace) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  // TODO(akalin): Generalize this to n clients.
-
-  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 =
-      (GetThemeID(GetProfile(0)) == GetCustomTheme(0)) &&
-      HasOrWillHaveCustomTheme(GetProfile(1), GetCustomTheme(0));
-  bool using_theme_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);
-}
-
-// TCM ID - 3723272.
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DisableThemes) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
-  ASSERT_FALSE(UsingCustomTheme(verifier()));
-
-  ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncable::THEMES));
-  UseCustomTheme(GetProfile(0), 0);
-  UseCustomTheme(verifier(), 0);
-  ASSERT_TRUE(AwaitQuiescence());
-
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-
-  ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncable::THEMES));
-  ASSERT_TRUE(AwaitQuiescence());
-
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
-  ASSERT_TRUE(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0)));
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-}
-
-// TCM ID - 3687288.
-IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DisableSync) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
-  ASSERT_FALSE(UsingCustomTheme(verifier()));
-
-  ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
-  UseCustomTheme(GetProfile(0), 0);
-  UseCustomTheme(verifier(), 0);
-  ASSERT_TRUE(
-      GetClient(0)->AwaitSyncCycleCompletion("Installed a custom theme."));
-
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-
-  ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
-  ASSERT_TRUE(AwaitQuiescence());
-
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
-  ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-  ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
-  ASSERT_TRUE(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0)));
-}