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

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

Issue 326043002: Cleanup: Remove more dead GTK code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix accidental revert Created 6 years, 6 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
« no previous file with comments | « chrome/browser/renderer_preferences_util.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
===================================================================
--- chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc (revision 277810)
+++ chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc (working copy)
@@ -65,7 +65,7 @@
ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
ChangeStringPref(0, prefs::kHomePage, "http://www.google.com/0");
- ChangeStringPref(1, prefs::kHomePage,"http://www.google.com/1");
+ ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1");
ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
}
@@ -515,22 +515,11 @@
ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));
}
-// TCM ID - 7590682
-#if defined(TOOLKIT_GTK)
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kUsesSystemTheme) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(BooleanPrefMatches(prefs::kUsesSystemTheme));
-
- ChangeBooleanPref(0, prefs::kUsesSystemTheme);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_FALSE(BooleanPrefMatches(prefs::kUsesSystemTheme));
-}
-#endif // TOOLKIT_GTK
-
// TCM ID - 6473347.
#if defined(OS_CHROMEOS)
// Disabled, http://crbug.com/351159 .
-IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DISABLED_kTapToClickEnabled) {
+IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
+ DISABLED_kTapToClickEnabled) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled));
« no previous file with comments | « chrome/browser/renderer_preferences_util.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698