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

Side by Side Diff: chrome/browser/sync/test/integration/single_client_apps_sync_test.cc

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/macros.h" 5 #include "base/macros.h"
6 #include "chrome/browser/sync/test/integration/apps_helper.h" 6 #include "chrome/browser/sync/test/integration/apps_helper.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 "components/browser_sync/browser/profile_sync_service.h" 9 #include "components/browser_sync/profile_sync_service.h"
10 10
11 using apps_helper::AllProfilesHaveSameApps; 11 using apps_helper::AllProfilesHaveSameApps;
12 using apps_helper::InstallApp; 12 using apps_helper::InstallApp;
13 using apps_helper::InstallPlatformApp; 13 using apps_helper::InstallPlatformApp;
14 using sync_integration_test_util::AwaitCommitActivityCompletion; 14 using sync_integration_test_util::AwaitCommitActivityCompletion;
15 15
16 class SingleClientAppsSyncTest : public SyncTest { 16 class SingleClientAppsSyncTest : public SyncTest {
17 public: 17 public:
18 SingleClientAppsSyncTest() : SyncTest(SINGLE_CLIENT) {} 18 SingleClientAppsSyncTest() : SyncTest(SINGLE_CLIENT) {}
19 19
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 const int kNumPlatformApps = 5; 99 const int kNumPlatformApps = 5;
100 for (int j = 0; j < kNumPlatformApps; ++i, ++j) { 100 for (int j = 0; j < kNumPlatformApps; ++i, ++j) {
101 InstallPlatformApp(GetProfile(0), i); 101 InstallPlatformApp(GetProfile(0), i);
102 InstallPlatformApp(verifier(), i); 102 InstallPlatformApp(verifier(), i);
103 } 103 }
104 104
105 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); 105 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
106 106
107 ASSERT_TRUE(AllProfilesHaveSameApps()); 107 ASSERT_TRUE(AllProfilesHaveSameApps());
108 } 108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698