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

Side by Side Diff: chrome/browser/sync/test/integration/single_client_extensions_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/extensions_helper.h" 7 #include "chrome/browser/sync/test/integration/extensions_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 extensions_helper::AllProfilesHaveSameExtensionsAsVerifier; 10 using extensions_helper::AllProfilesHaveSameExtensionsAsVerifier;
11 using extensions_helper::InstallExtension; 11 using extensions_helper::InstallExtension;
12 12
13 class SingleClientExtensionsSyncTest : public LiveSyncTest { 13 class SingleClientExtensionsSyncTest : public SyncTest {
14 public: 14 public:
15 SingleClientExtensionsSyncTest() : LiveSyncTest(SINGLE_CLIENT) {} 15 SingleClientExtensionsSyncTest() : SyncTest(SINGLE_CLIENT) {}
16 16
17 virtual ~SingleClientExtensionsSyncTest() {} 17 virtual ~SingleClientExtensionsSyncTest() {}
18 18
19 private: 19 private:
20 DISALLOW_COPY_AND_ASSIGN(SingleClientExtensionsSyncTest); 20 DISALLOW_COPY_AND_ASSIGN(SingleClientExtensionsSyncTest);
21 }; 21 };
22 22
23 IN_PROC_BROWSER_TEST_F(SingleClientExtensionsSyncTest, StartWithNoExtensions) { 23 IN_PROC_BROWSER_TEST_F(SingleClientExtensionsSyncTest, StartWithNoExtensions) {
24 ASSERT_TRUE(SetupSync()); 24 ASSERT_TRUE(SetupSync());
25 25
(...skipping 22 matching lines...) Expand all
48 for (int i = 0; i < kNumExtensions; ++i) { 48 for (int i = 0; i < kNumExtensions; ++i) {
49 InstallExtension(GetProfile(0), i); 49 InstallExtension(GetProfile(0), i);
50 InstallExtension(verifier(), i); 50 InstallExtension(verifier(), i);
51 } 51 }
52 52
53 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion( 53 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
54 "Waiting for extension changes.")); 54 "Waiting for extension changes."));
55 55
56 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier()); 56 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
57 } 57 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698