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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/guid.h" | 7 #include "base/guid.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/prefs/pref_service.h" | |
10 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
11 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 10 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
12 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 11 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
13 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
14 #include "chrome/browser/sync/test/integration/sync_test.h" | 13 #include "chrome/browser/sync/test/integration/sync_test.h" |
15 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 #include "components/prefs/pref_service.h" |
16 | 16 |
17 using preferences_helper::AwaitBooleanPrefMatches; | 17 using preferences_helper::AwaitBooleanPrefMatches; |
18 using preferences_helper::AwaitIntegerPrefMatches; | 18 using preferences_helper::AwaitIntegerPrefMatches; |
19 using preferences_helper::AwaitListPrefMatches; | 19 using preferences_helper::AwaitListPrefMatches; |
20 using preferences_helper::AwaitStringPrefMatches; | 20 using preferences_helper::AwaitStringPrefMatches; |
21 using preferences_helper::BooleanPrefMatches; | 21 using preferences_helper::BooleanPrefMatches; |
22 using preferences_helper::ChangeBooleanPref; | 22 using preferences_helper::ChangeBooleanPref; |
23 using preferences_helper::ChangeIntegerPref; | 23 using preferences_helper::ChangeIntegerPref; |
24 using preferences_helper::ChangeListPref; | 24 using preferences_helper::ChangeListPref; |
25 using preferences_helper::ChangeStringPref; | 25 using preferences_helper::ChangeStringPref; |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 | 136 |
137 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); | 137 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); |
138 ASSERT_TRUE(EnableEncryption(0)); | 138 ASSERT_TRUE(EnableEncryption(0)); |
139 ASSERT_TRUE(EnableEncryption(1)); | 139 ASSERT_TRUE(EnableEncryption(1)); |
140 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage)); | 140 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage)); |
141 | 141 |
142 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton)); | 142 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton)); |
143 ChangeBooleanPref(0, prefs::kShowHomeButton); | 143 ChangeBooleanPref(0, prefs::kShowHomeButton); |
144 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton)); | 144 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton)); |
145 } | 145 } |
OLD | NEW |