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

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

Issue 7841007: Rename browser/sync/test/live_sync directory to browser/sync/test/integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 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 | Annotate | Revision Log
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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "chrome/browser/sync/profile_sync_service_harness.h" 6 #include "chrome/browser/sync/profile_sync_service_harness.h"
7 #include "chrome/browser/sync/test/live_sync/apps_helper.h" 7 #include "chrome/browser/sync/test/integration/apps_helper.h"
8 #include "chrome/browser/sync/test/live_sync/live_sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 9
10 using apps_helper::AllProfilesHaveSameAppsAsVerifier; 10 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
11 using apps_helper::InstallApp; 11 using apps_helper::InstallApp;
12 12
13 class SingleClientAppsSyncTest : public LiveSyncTest { 13 class SingleClientAppsSyncTest : public SyncTest {
14 public: 14 public:
15 SingleClientAppsSyncTest() : LiveSyncTest(SINGLE_CLIENT) {} 15 SingleClientAppsSyncTest() : SyncTest(SINGLE_CLIENT) {}
16 16
17 virtual ~SingleClientAppsSyncTest() {} 17 virtual ~SingleClientAppsSyncTest() {}
18 18
19 private: 19 private:
20 DISALLOW_COPY_AND_ASSIGN(SingleClientAppsSyncTest); 20 DISALLOW_COPY_AND_ASSIGN(SingleClientAppsSyncTest);
21 }; 21 };
22 22
23 IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithNoApps) { 23 IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithNoApps) {
24 ASSERT_TRUE(SetupSync()); 24 ASSERT_TRUE(SetupSync());
25 25
(...skipping 21 matching lines...) Expand all
47 for (int i = 0; i < kNumApps; ++i) { 47 for (int i = 0; i < kNumApps; ++i) {
48 InstallApp(GetProfile(0), i); 48 InstallApp(GetProfile(0), i);
49 InstallApp(verifier(), i); 49 InstallApp(verifier(), i);
50 } 50 }
51 51
52 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion( 52 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
53 "Waiting for app changes.")); 53 "Waiting for app changes."));
54 54
55 ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier()); 55 ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
56 } 56 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698