Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Side by Side Diff: chrome/browser/sync/test/integration/single_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
OLDNEW
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"
7 #include "chrome/browser/sync/test/integration/apps_helper.h" 9 #include "chrome/browser/sync/test/integration/apps_helper.h"
8 #include "chrome/browser/sync/test/integration/sync_app_list_helper.h" 10 #include "chrome/browser/sync/test/integration/sync_app_list_helper.h"
9 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 11 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
10 #include "chrome/browser/sync/test/integration/sync_test.h" 12 #include "chrome/browser/sync/test/integration/sync_test.h"
11 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" 13 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
12 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" 14 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
13 #include "components/browser_sync/browser/profile_sync_service.h" 15 #include "components/browser_sync/browser/profile_sync_service.h"
14 #include "ui/app_list/app_list_switches.h" 16 #include "ui/app_list/app_list_switches.h"
15 17
16 using sync_integration_test_util::AwaitCommitActivityCompletion; 18 using sync_integration_test_util::AwaitCommitActivityCompletion;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 70 }
69 71
70 app_list::AppListSyncableService* service = 72 app_list::AppListSyncableService* service =
71 app_list::AppListSyncableServiceFactory::GetForProfile(verifier()); 73 app_list::AppListSyncableServiceFactory::GetForProfile(verifier());
72 ASSERT_EQ(kNumApps + kNumDefaultApps, service->GetNumSyncItemsForTest()); 74 ASSERT_EQ(kNumApps + kNumDefaultApps, service->GetNumSyncItemsForTest());
73 75
74 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); 76 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
75 ASSERT_TRUE(AllProfilesHaveSameAppListAsVerifier()); 77 ASSERT_TRUE(AllProfilesHaveSameAppListAsVerifier());
76 78
77 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698