chrome/browser/sync/test/integration/two_client_app_list_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_app_list_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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 <stddef.h>

	6

6 #include "base/command_line.h"	7 #include "base/command_line.h"

	8 #include "base/macros.h"

	9 #include "build/build_config.h"

7 #include "chrome/browser/chrome_notification_types.h"	10 #include "chrome/browser/chrome_notification_types.h"

8 #include "chrome/browser/extensions/extension_service.h"	11 #include "chrome/browser/extensions/extension_service.h"

9 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

10 #include "chrome/browser/sync/test/integration/apps_helper.h"	13 #include "chrome/browser/sync/test/integration/apps_helper.h"

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

12 #include "chrome/browser/sync/test/integration/sync_app_list_helper.h"	15 #include "chrome/browser/sync/test/integration/sync_app_list_helper.h"

13 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"	16 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"

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

15 #include "chrome/browser/ui/app_list/app_list_prefs.h"	18 #include "chrome/browser/ui/app_list/app_list_prefs.h"

16 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"	19 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"

(...skipping 601 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
618 GetProfile(0), item_index, folder_id);	621 GetProfile(0), item_index, folder_id);

619 SyncAppListHelper::GetInstance()->MoveAppToFolder(	622 SyncAppListHelper::GetInstance()->MoveAppToFolder(

620 verifier(), item_index, folder_id);	623 verifier(), item_index, folder_id);

621 }	624 }

622	625

623 ASSERT_TRUE(AwaitQuiescence());	626 ASSERT_TRUE(AwaitQuiescence());

624 ASSERT_TRUE(AllProfilesHaveSameAppListAsVerifier());	627 ASSERT_TRUE(AllProfilesHaveSameAppListAsVerifier());

625 }	628 }

626	629

627 #endif // !defined(OS_MACOSX)	630 #endif // !defined(OS_MACOSX)

OLD	NEW