chrome/browser/sync/test/integration/single_client_themes_sync_test.cc - Issue 2345843003: [Sync] Merge //components/browser_sync into one directory.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)

Patch Set: Address comment + rebase. Created 4 years, 3 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

« no previous file with comments | « chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc ('k') | chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/macros.h"	5 #include "base/macros.h"

6 #include "build/build_config.h"	6 #include "build/build_config.h"

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

10 #include "components/browser_sync/browser/profile_sync_service.h"	10 #include "components/browser_sync/profile_sync_service.h"

11	11

12 using sync_integration_test_util::AwaitCommitActivityCompletion;	12 using sync_integration_test_util::AwaitCommitActivityCompletion;

13 using themes_helper::GetCustomTheme;	13 using themes_helper::GetCustomTheme;

14 using themes_helper::GetThemeID;	14 using themes_helper::GetThemeID;

15 using themes_helper::UseCustomTheme;	15 using themes_helper::UseCustomTheme;

16 using themes_helper::UseDefaultTheme;	16 using themes_helper::UseDefaultTheme;

17 using themes_helper::UseSystemTheme;	17 using themes_helper::UseSystemTheme;

18 using themes_helper::UsingCustomTheme;	18 using themes_helper::UsingCustomTheme;

19 using themes_helper::UsingDefaultTheme;	19 using themes_helper::UsingDefaultTheme;

20 using themes_helper::UsingSystemTheme;	20 using themes_helper::UsingSystemTheme;

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
88 UseDefaultTheme(GetProfile(0));	88 UseDefaultTheme(GetProfile(0));

89 UseDefaultTheme(verifier());	89 UseDefaultTheme(verifier());

90 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));	90 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));

91 ASSERT_TRUE(UsingDefaultTheme(verifier()));	91 ASSERT_TRUE(UsingDefaultTheme(verifier()));

92	92

93 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));	93 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));

94	94

95 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));	95 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));

96 ASSERT_TRUE(UsingDefaultTheme(verifier()));	96 ASSERT_TRUE(UsingDefaultTheme(verifier()));

97 }	97 }

OLD	NEW