diff options
| -rw-r--r-- | chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.cc | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc index b2bead4..757a1b7 100644 --- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc @@ -517,19 +517,6 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kUsesSystemTheme) { } #endif // TOOLKIT_GTK -// TCM ID - 3636292 -#if defined(TOOLKIT_GTK) -IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, - kUseCustomChromeFrame) { - ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; - ASSERT_TRUE(BooleanPrefMatches(prefs::kUseCustomChromeFrame)); - - ChangeBooleanPref(0, prefs::kUseCustomChromeFrame); - ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); - ASSERT_TRUE(BooleanPrefMatches(prefs::kUseCustomChromeFrame)); -} -#endif // TOOLKIT_GTK - // TCM ID - 6473347. #if defined(OS_CHROMEOS) IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kTapToClickEnabled) { diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index f8f7513..cf865e6 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -1501,7 +1501,7 @@ void BrowserWindowGtk::RegisterUserPrefs(PrefServiceSyncable* prefs) { } prefs->RegisterBooleanPref(prefs::kUseCustomChromeFrame, custom_frame_default, - PrefServiceSyncable::SYNCABLE_PREF); + PrefServiceSyncable::UNSYNCABLE_PREF); } WebContents* BrowserWindowGtk::GetDisplayedTab() { |