| 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/live_sync/themes_helper.h" | 7 #include "chrome/browser/sync/test/integration/themes_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 themes_helper::GetCustomTheme; | 10 using themes_helper::GetCustomTheme; |
| 11 using themes_helper::GetThemeID; | 11 using themes_helper::GetThemeID; |
| 12 using themes_helper::UseCustomTheme; | 12 using themes_helper::UseCustomTheme; |
| 13 using themes_helper::UseDefaultTheme; | 13 using themes_helper::UseDefaultTheme; |
| 14 using themes_helper::UseNativeTheme; | 14 using themes_helper::UseNativeTheme; |
| 15 using themes_helper::UsingCustomTheme; | 15 using themes_helper::UsingCustomTheme; |
| 16 using themes_helper::UsingDefaultTheme; | 16 using themes_helper::UsingDefaultTheme; |
| 17 using themes_helper::UsingNativeTheme; | 17 using themes_helper::UsingNativeTheme; |
| 18 | 18 |
| 19 class SingleClientThemesSyncTest : public LiveSyncTest { | 19 class SingleClientThemesSyncTest : public SyncTest { |
| 20 public: | 20 public: |
| 21 SingleClientThemesSyncTest() : LiveSyncTest(SINGLE_CLIENT) {} | 21 SingleClientThemesSyncTest() : SyncTest(SINGLE_CLIENT) {} |
| 22 virtual ~SingleClientThemesSyncTest() {} | 22 virtual ~SingleClientThemesSyncTest() {} |
| 23 | 23 |
| 24 private: | 24 private: |
| 25 DISALLOW_COPY_AND_ASSIGN(SingleClientThemesSyncTest); | 25 DISALLOW_COPY_AND_ASSIGN(SingleClientThemesSyncTest); |
| 26 }; | 26 }; |
| 27 | 27 |
| 28 // TODO(akalin): Add tests for model association (i.e., tests that | 28 // TODO(akalin): Add tests for model association (i.e., tests that |
| 29 // start with SetupClients(), change the theme state, then call | 29 // start with SetupClients(), change the theme state, then call |
| 30 // SetupSync()). | 30 // SetupSync()). |
| 31 | 31 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after 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)->AwaitSyncCycleCompletion( | 94 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion( |
| 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 |