OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/test/live_sync/live_extensions_sync_test.h" | 5 #include "chrome/test/live_sync/live_extensions_sync_test.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/common/extensions/extension.h" | 9 #include "chrome/common/extensions/extension.h" |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... |
21 | 21 |
22 IN_PROC_BROWSER_TEST_F(SingleClientLiveExtensionsSyncTest, | 22 IN_PROC_BROWSER_TEST_F(SingleClientLiveExtensionsSyncTest, |
23 StartWithNoExtensions) { | 23 StartWithNoExtensions) { |
24 ASSERT_TRUE(SetupSync()); | 24 ASSERT_TRUE(SetupSync()); |
25 | 25 |
26 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier()); | 26 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier()); |
27 } | 27 } |
28 | 28 |
29 // TODO(rsimha): Enable after http://crbug.com/70028 is fixed. | 29 // TODO(rsimha): Enable after http://crbug.com/70028 is fixed. |
30 IN_PROC_BROWSER_TEST_F(SingleClientLiveExtensionsSyncTest, | 30 IN_PROC_BROWSER_TEST_F(SingleClientLiveExtensionsSyncTest, |
31 FAILS_StartWithSomeExtensions) { | 31 DISABLED_StartWithSomeExtensions) { |
32 ASSERT_TRUE(SetupClients()); | 32 ASSERT_TRUE(SetupClients()); |
33 | 33 |
34 const int kNumExtensions = 5; | 34 const int kNumExtensions = 5; |
35 for (int i = 0; i < kNumExtensions; ++i) { | 35 for (int i = 0; i < kNumExtensions; ++i) { |
36 InstallExtension(GetProfile(0), GetExtension(i)); | 36 InstallExtension(GetProfile(0), GetExtension(i)); |
37 InstallExtension(verifier(), GetExtension(i)); | 37 InstallExtension(verifier(), GetExtension(i)); |
38 } | 38 } |
39 | 39 |
40 ASSERT_TRUE(SetupSync()); | 40 ASSERT_TRUE(SetupSync()); |
41 | 41 |
42 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier()); | 42 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier()); |
43 } | 43 } |
44 | 44 |
45 IN_PROC_BROWSER_TEST_F(SingleClientLiveExtensionsSyncTest, | 45 IN_PROC_BROWSER_TEST_F(SingleClientLiveExtensionsSyncTest, |
46 InstallSomeExtensions) { | 46 InstallSomeExtensions) { |
47 ASSERT_TRUE(SetupSync()); | 47 ASSERT_TRUE(SetupSync()); |
48 | 48 |
49 const int kNumExtensions = 5; | 49 const int kNumExtensions = 5; |
50 for (int i = 0; i < kNumExtensions; ++i) { | 50 for (int i = 0; i < kNumExtensions; ++i) { |
51 InstallExtension(GetProfile(0), GetExtension(i)); | 51 InstallExtension(GetProfile(0), GetExtension(i)); |
52 InstallExtension(verifier(), GetExtension(i)); | 52 InstallExtension(verifier(), GetExtension(i)); |
53 } | 53 } |
54 | 54 |
55 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion( | 55 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion( |
56 "Waiting for extension changes.")); | 56 "Waiting for extension changes.")); |
57 | 57 |
58 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier()); | 58 ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier()); |
59 } | 59 } |
OLD | NEW |