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

Side by Side Diff: chrome/browser/sync/test/integration/two_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::DisableExtension; 11 using extensions_helper::DisableExtension;
12 using extensions_helper::EnableExtension; 12 using extensions_helper::EnableExtension;
13 using extensions_helper::HasSameExtensionsAsVerifier; 13 using extensions_helper::HasSameExtensionsAsVerifier;
14 using extensions_helper::IncognitoDisableExtension; 14 using extensions_helper::IncognitoDisableExtension;
15 using extensions_helper::IncognitoEnableExtension; 15 using extensions_helper::IncognitoEnableExtension;
16 using extensions_helper::InstallExtension; 16 using extensions_helper::InstallExtension;
17 using extensions_helper::InstallExtensionsPendingForSync; 17 using extensions_helper::InstallExtensionsPendingForSync;
18 using extensions_helper::UninstallExtension; 18 using extensions_helper::UninstallExtension;
19 19
20 class TwoClientExtensionsSyncTest : public LiveSyncTest { 20 class TwoClientExtensionsSyncTest : public SyncTest {
21 public: 21 public:
22 TwoClientExtensionsSyncTest() : LiveSyncTest(TWO_CLIENT) {} 22 TwoClientExtensionsSyncTest() : SyncTest(TWO_CLIENT) {}
23 23
24 virtual ~TwoClientExtensionsSyncTest() {} 24 virtual ~TwoClientExtensionsSyncTest() {}
25 25
26 private: 26 private:
27 DISALLOW_COPY_AND_ASSIGN(TwoClientExtensionsSyncTest); 27 DISALLOW_COPY_AND_ASSIGN(TwoClientExtensionsSyncTest);
28 }; 28 };
29 29
30 IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, StartWithNoExtensions) { 30 IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, StartWithNoExtensions) {
31 ASSERT_TRUE(SetupSync()); 31 ASSERT_TRUE(SetupSync());
32 32
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes()); 274 ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
275 ASSERT_TRUE(AwaitQuiescence()); 275 ASSERT_TRUE(AwaitQuiescence());
276 InstallExtensionsPendingForSync(GetProfile(0)); 276 InstallExtensionsPendingForSync(GetProfile(0));
277 InstallExtensionsPendingForSync(GetProfile(1)); 277 InstallExtensionsPendingForSync(GetProfile(1));
278 InstallExtensionsPendingForSync(verifier()); 278 InstallExtensionsPendingForSync(verifier());
279 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier()); 279 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
280 } 280 }
281 281
282 // TODO(akalin): Add tests exercising: 282 // TODO(akalin): Add tests exercising:
283 // - Offline installation/uninstallation behavior 283 // - Offline installation/uninstallation behavior
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698