OLD | NEW |
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/integration/themes_helper.h" | 7 #include "chrome/browser/sync/test/integration/themes_helper.h" |
8 #include "chrome/browser/sync/test/integration/sync_test.h" | 8 #include "chrome/browser/sync/test/integration/sync_test.h" |
9 | 9 |
10 using themes_helper::GetCustomTheme; | 10 using themes_helper::GetCustomTheme; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 | 42 |
43 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion( | 43 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion( |
44 "Waiting for custom themes change.")); | 44 "Waiting for custom themes change.")); |
45 | 45 |
46 ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0))); | 46 ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0))); |
47 ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier())); | 47 ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier())); |
48 } | 48 } |
49 | 49 |
50 // TODO(sync): Fails on Chrome OS. See http://crbug.com/84575. | 50 // TODO(sync): Fails on Chrome OS. See http://crbug.com/84575. |
51 #if defined(OS_CHROMEOS) | 51 #if defined(OS_CHROMEOS) |
52 IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, FAILS_NativeTheme) { | 52 IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, DISABLED_NativeTheme) { |
53 #else | 53 #else |
54 IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, NativeTheme) { | 54 IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, NativeTheme) { |
55 #endif // OS_CHROMEOS | 55 #endif // OS_CHROMEOS |
56 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 56 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
57 | 57 |
58 UseCustomTheme(GetProfile(0), 0); | 58 UseCustomTheme(GetProfile(0), 0); |
59 UseCustomTheme(verifier(), 0); | 59 UseCustomTheme(verifier(), 0); |
60 ASSERT_FALSE(UsingNativeTheme(GetProfile(0))); | 60 ASSERT_FALSE(UsingNativeTheme(GetProfile(0))); |
61 ASSERT_FALSE(UsingNativeTheme(verifier())); | 61 ASSERT_FALSE(UsingNativeTheme(verifier())); |
62 | 62 |
(...skipping 27 matching lines...) Expand all Loading... |
90 UseDefaultTheme(verifier()); | 90 UseDefaultTheme(verifier()); |
91 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); | 91 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); |
92 ASSERT_TRUE(UsingDefaultTheme(verifier())); | 92 ASSERT_TRUE(UsingDefaultTheme(verifier())); |
93 | 93 |
94 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion( | 94 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion( |
95 "Waiting for native themes change.")); | 95 "Waiting for native themes change.")); |
96 | 96 |
97 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); | 97 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); |
98 ASSERT_TRUE(UsingDefaultTheme(verifier())); | 98 ASSERT_TRUE(UsingDefaultTheme(verifier())); |
99 } | 99 } |
OLD | NEW |