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 "base/basictypes.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "chrome/browser/sync/profile_sync_service.h" | |
8 #include "chrome/browser/sync/test/integration/apps_helper.h" | 7 #include "chrome/browser/sync/test/integration/apps_helper.h" |
9 #include "chrome/browser/sync/test/integration/sync_app_list_helper.h" | 8 #include "chrome/browser/sync/test/integration/sync_app_list_helper.h" |
10 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 9 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
11 #include "chrome/browser/sync/test/integration/sync_test.h" | 10 #include "chrome/browser/sync/test/integration/sync_test.h" |
12 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" | 11 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
13 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" | 12 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" |
| 13 #include "components/browser_sync/browser/profile_sync_service.h" |
14 #include "ui/app_list/app_list_switches.h" | 14 #include "ui/app_list/app_list_switches.h" |
15 | 15 |
16 using sync_integration_test_util::AwaitCommitActivityCompletion; | 16 using sync_integration_test_util::AwaitCommitActivityCompletion; |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 const size_t kNumDefaultApps = 2; | 20 const size_t kNumDefaultApps = 2; |
21 | 21 |
22 bool AllProfilesHaveSameAppListAsVerifier() { | 22 bool AllProfilesHaveSameAppListAsVerifier() { |
23 return SyncAppListHelper::GetInstance()-> | 23 return SyncAppListHelper::GetInstance()-> |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 } | 68 } |
69 | 69 |
70 app_list::AppListSyncableService* service = | 70 app_list::AppListSyncableService* service = |
71 app_list::AppListSyncableServiceFactory::GetForProfile(verifier()); | 71 app_list::AppListSyncableServiceFactory::GetForProfile(verifier()); |
72 ASSERT_EQ(kNumApps + kNumDefaultApps, service->GetNumSyncItemsForTest()); | 72 ASSERT_EQ(kNumApps + kNumDefaultApps, service->GetNumSyncItemsForTest()); |
73 | 73 |
74 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); | 74 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); |
75 ASSERT_TRUE(AllProfilesHaveSameAppListAsVerifier()); | 75 ASSERT_TRUE(AllProfilesHaveSameAppListAsVerifier()); |
76 | 76 |
77 } | 77 } |
OLD | NEW |