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.h" | |
7 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 6 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
8 #include "chrome/browser/sync/test/integration/sync_test.h" | 7 #include "chrome/browser/sync/test/integration/sync_test.h" |
9 #include "chrome/browser/sync/test/integration/themes_helper.h" | 8 #include "chrome/browser/sync/test/integration/themes_helper.h" |
| 9 #include "components/browser_sync/browser/profile_sync_service.h" |
10 | 10 |
11 using sync_integration_test_util::AwaitCommitActivityCompletion; | 11 using sync_integration_test_util::AwaitCommitActivityCompletion; |
12 using themes_helper::GetCustomTheme; | 12 using themes_helper::GetCustomTheme; |
13 using themes_helper::GetThemeID; | 13 using themes_helper::GetThemeID; |
14 using themes_helper::UseCustomTheme; | 14 using themes_helper::UseCustomTheme; |
15 using themes_helper::UseDefaultTheme; | 15 using themes_helper::UseDefaultTheme; |
16 using themes_helper::UseSystemTheme; | 16 using themes_helper::UseSystemTheme; |
17 using themes_helper::UsingCustomTheme; | 17 using themes_helper::UsingCustomTheme; |
18 using themes_helper::UsingDefaultTheme; | 18 using themes_helper::UsingDefaultTheme; |
19 using themes_helper::UsingSystemTheme; | 19 using themes_helper::UsingSystemTheme; |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 UseDefaultTheme(GetProfile(0)); | 87 UseDefaultTheme(GetProfile(0)); |
88 UseDefaultTheme(verifier()); | 88 UseDefaultTheme(verifier()); |
89 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); | 89 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); |
90 ASSERT_TRUE(UsingDefaultTheme(verifier())); | 90 ASSERT_TRUE(UsingDefaultTheme(verifier())); |
91 | 91 |
92 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); | 92 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); |
93 | 93 |
94 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); | 94 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); |
95 ASSERT_TRUE(UsingDefaultTheme(verifier())); | 95 ASSERT_TRUE(UsingDefaultTheme(verifier())); |
96 } | 96 } |
OLD | NEW |