chrome/browser/sync/test/integration/two_client_sessions_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_sessions_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, 11 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_search_engines_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_themes_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 <string>	5 #include <string>

6	6

7 #include "base/guid.h"	7 #include "base/guid.h"

	8 #include "base/macros.h"

8 #include "base/strings/stringprintf.h"	9 #include "base/strings/stringprintf.h"

	10 #include "build/build_config.h"

9 #include "chrome/browser/sessions/session_service.h"	11 #include "chrome/browser/sessions/session_service.h"

10 #include "chrome/browser/sync/test/integration/passwords_helper.h"	12 #include "chrome/browser/sync/test/integration/passwords_helper.h"

11 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"	13 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"

12 #include "chrome/browser/sync/test/integration/sessions_helper.h"	14 #include "chrome/browser/sync/test/integration/sessions_helper.h"

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

14 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"	16 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"

15	17

16 using passwords_helper::SetDecryptionPassphrase;	18 using passwords_helper::SetDecryptionPassphrase;

17 using passwords_helper::SetEncryptionPassphrase;	19 using passwords_helper::SetEncryptionPassphrase;

18 using sessions_helper::CheckInitialState;	20 using sessions_helper::CheckInitialState;

(...skipping 211 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
230 ASSERT_FALSE(GetSessionData(1, &sessions1));	232 ASSERT_FALSE(GetSessionData(1, &sessions1));

231	233

232 // Client 0 becomes active again with a new tab.	234 // Client 0 becomes active again with a new tab.

233 ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2),	235 ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2),

234 client0_windows.GetMutable()));	236 client0_windows.GetMutable()));

235 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));	237 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

236 ASSERT_TRUE(GetSessionData(1, &sessions1));	238 ASSERT_TRUE(GetSessionData(1, &sessions1));

237 ASSERT_EQ(1U, sessions1.size());	239 ASSERT_EQ(1U, sessions1.size());

238 ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));	240 ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));

239 }	241 }

OLD	NEW