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

Unified Diff: chrome/test/live_sync/single_client_themes_sync_test.cc

Issue 7828055: Move sync test code out of chrome/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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/test/live_sync/single_client_themes_sync_test.cc
===================================================================
--- chrome/test/live_sync/single_client_themes_sync_test.cc (revision 99413)
+++ chrome/test/live_sync/single_client_themes_sync_test.cc (working copy)
@@ -1,99 +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/test/live_sync/themes_helper.h"
-#include "chrome/test/live_sync/live_sync_test.h"
-
-using themes_helper::GetCustomTheme;
-using themes_helper::GetThemeID;
-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 SingleClientThemesSyncTest : public LiveSyncTest {
- public:
- SingleClientThemesSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}
- virtual ~SingleClientThemesSyncTest() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SingleClientThemesSyncTest);
-};
-
-// TODO(akalin): Add tests for model association (i.e., tests that
-// start with SetupClients(), change the theme state, then call
-// SetupSync()).
-
-IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, CustomTheme) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
- 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)->AwaitSyncCycleCompletion(
- "Waiting for custom themes change."));
-
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-}
-
-// TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, FAILS_NativeTheme) {
-#else
-IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, NativeTheme) {
-#endif // OS_CHROMEOS
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(verifier(), 0);
- ASSERT_FALSE(UsingNativeTheme(GetProfile(0)));
- ASSERT_FALSE(UsingNativeTheme(verifier()));
-
- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
- "Waiting for custom themes change."));
-
- UseNativeTheme(GetProfile(0));
- UseNativeTheme(verifier());
- ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
- ASSERT_TRUE(UsingNativeTheme(verifier()));
-
- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
- "Waiting for native themes change."));
-
- ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
- ASSERT_TRUE(UsingNativeTheme(verifier()));
-}
-
-IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, DefaultTheme) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(verifier(), 0);
- ASSERT_FALSE(UsingDefaultTheme(GetProfile(0)));
- ASSERT_FALSE(UsingDefaultTheme(verifier()));
-
- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
- "Waiting for custom themes change."));
-
- UseDefaultTheme(GetProfile(0));
- UseDefaultTheme(verifier());
- ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
- ASSERT_TRUE(UsingDefaultTheme(verifier()));
-
- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
- "Waiting for native themes change."));
-
- ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
- ASSERT_TRUE(UsingDefaultTheme(verifier()));
-}
« no previous file with comments | « chrome/test/live_sync/single_client_sessions_sync_test.cc ('k') | chrome/test/live_sync/single_client_typed_urls_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698