| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/values.h" | 5 #include "base/values.h" |
| 6 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 6 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
| 7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 8 #include "chrome/browser/sync/test/integration/sync_test.h" | 8 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 9 #include "chrome/browser/translate/translate_prefs.h" | 9 #include "chrome/browser/translate/translate_prefs.h" |
| 10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
| 11 #include "components/translate/core/common/translate_pref_names.h" |
| 11 | 12 |
| 12 using preferences_helper::AppendStringPref; | 13 using preferences_helper::AppendStringPref; |
| 13 using preferences_helper::BooleanPrefMatches; | 14 using preferences_helper::BooleanPrefMatches; |
| 14 using preferences_helper::ChangeBooleanPref; | 15 using preferences_helper::ChangeBooleanPref; |
| 15 using preferences_helper::ChangeIntegerPref; | 16 using preferences_helper::ChangeIntegerPref; |
| 16 using preferences_helper::ChangeInt64Pref; | 17 using preferences_helper::ChangeInt64Pref; |
| 17 using preferences_helper::ChangeListPref; | 18 using preferences_helper::ChangeListPref; |
| 18 using preferences_helper::ChangeStringPref; | 19 using preferences_helper::ChangeStringPref; |
| 19 using preferences_helper::GetPrefs; | 20 using preferences_helper::GetPrefs; |
| 20 using preferences_helper::IntegerPrefMatches; | 21 using preferences_helper::IntegerPrefMatches; |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 587 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 588 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 588 ASSERT_TRUE(IsEncryptionComplete(0)); | 589 ASSERT_TRUE(IsEncryptionComplete(0)); |
| 589 ASSERT_TRUE(IsEncryptionComplete(1)); | 590 ASSERT_TRUE(IsEncryptionComplete(1)); |
| 590 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); | 591 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); |
| 591 | 592 |
| 592 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); | 593 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); |
| 593 ChangeBooleanPref(0, prefs::kShowHomeButton); | 594 ChangeBooleanPref(0, prefs::kShowHomeButton); |
| 594 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 595 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 595 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); | 596 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); |
| 596 } | 597 } |
| OLD | NEW |