chrome/browser/sync/test/integration/two_client_themes_sync_test.cc - Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4.

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/two_client_themes_sync_test.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 4 years, 12 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/two_client_sessions_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_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) 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/basictypes.h"	5 #include "base/macros.h"

6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"	6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.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	10

11 using themes_helper::AwaitThemeIsPendingInstall;	11 using themes_helper::AwaitThemeIsPendingInstall;

12 using themes_helper::AwaitUsingSystemTheme;	12 using themes_helper::AwaitUsingSystemTheme;

13 using themes_helper::AwaitUsingDefaultTheme;	13 using themes_helper::AwaitUsingDefaultTheme;

14 using themes_helper::GetCustomTheme;	14 using themes_helper::GetCustomTheme;

15 using themes_helper::GetThemeID;	15 using themes_helper::GetThemeID;

(...skipping 114 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
130 EXPECT_TRUE(UsingDefaultTheme(GetProfile(0)));	130 EXPECT_TRUE(UsingDefaultTheme(GetProfile(0)));

131 EXPECT_TRUE(UsingDefaultTheme(GetProfile(1)));	131 EXPECT_TRUE(UsingDefaultTheme(GetProfile(1)));

132 EXPECT_TRUE(UsingDefaultTheme(verifier()));	132 EXPECT_TRUE(UsingDefaultTheme(verifier()));

133	133

134 UseCustomTheme(GetProfile(0), 1);	134 UseCustomTheme(GetProfile(0), 1);

135 UseCustomTheme(verifier(), 1);	135 UseCustomTheme(verifier(), 1);

136 ASSERT_TRUE(AwaitThemeIsPendingInstall(GetProfile(1), GetCustomTheme(1)));	136 ASSERT_TRUE(AwaitThemeIsPendingInstall(GetProfile(1), GetCustomTheme(1)));

137 EXPECT_EQ(GetCustomTheme(1), GetThemeID(GetProfile(0)));	137 EXPECT_EQ(GetCustomTheme(1), GetThemeID(GetProfile(0)));

138 EXPECT_EQ(GetCustomTheme(1), GetThemeID(verifier()));	138 EXPECT_EQ(GetCustomTheme(1), GetThemeID(verifier()));

139 }	139 }

OLD	NEW