chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc - Issue 228393004: Create bookmarks component with names of bookmark preferences

Side by Side Diff: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

Issue 228393004: Create bookmarks component with names of bookmark preferences (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add empty line at beginning and end of namespace Created 6 years, 8 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 unified diff | Download patch

« chrome/browser/android/bookmarks/bookmarks_bridge.cc ('K') | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc » ('j') | components/bookmarks.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_integration_test_util.h"	8 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"

9 #include "chrome/browser/sync/test/integration/sync_test.h"	9 #include "chrome/browser/sync/test/integration/sync_test.h"

10 #include "chrome/browser/translate/translate_tab_helper.h"	10 #include "chrome/browser/translate/translate_tab_helper.h"

11 #include "chrome/common/pref_names.h"	11 #include "chrome/common/pref_names.h"

	12 #include "components/bookmarks/bookmark_pref_names.h"

12 #include "components/password_manager/core/common/password_manager_pref_names.h"	13 #include "components/password_manager/core/common/password_manager_pref_names.h"

13 #include "components/sync_driver/pref_names.h"	14 #include "components/sync_driver/pref_names.h"

14 #include "components/translate/core/browser/translate_prefs.h"	15 #include "components/translate/core/browser/translate_prefs.h"

15 #include "components/translate/core/common/translate_pref_names.h"	16 #include "components/translate/core/common/translate_pref_names.h"

16	17

17 using preferences_helper::AppendStringPref;	18 using preferences_helper::AppendStringPref;

18 using preferences_helper::BooleanPrefMatches;	19 using preferences_helper::BooleanPrefMatches;

19 using preferences_helper::ChangeBooleanPref;	20 using preferences_helper::ChangeBooleanPref;

20 using preferences_helper::ChangeIntegerPref;	21 using preferences_helper::ChangeIntegerPref;

21 using preferences_helper::ChangeInt64Pref;	22 using preferences_helper::ChangeInt64Pref;

(...skipping 591 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
613 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));	614 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

614 ASSERT_TRUE(IsEncryptionComplete(0));	615 ASSERT_TRUE(IsEncryptionComplete(0));

615 ASSERT_TRUE(IsEncryptionComplete(1));	616 ASSERT_TRUE(IsEncryptionComplete(1));

616 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));	617 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));

617	618

618 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));	619 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));

619 ChangeBooleanPref(0, prefs::kShowHomeButton);	620 ChangeBooleanPref(0, prefs::kShowHomeButton);

620 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));	621 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

621 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));	622 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));

622 }	623 }

OLD	NEW