| 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/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/search_engines/template_url.h" | 6 #include "chrome/browser/search_engines/template_url.h" |
| 7 #include "chrome/browser/search_engines/template_url_service.h" | 7 #include "chrome/browser/search_engines/template_url_service.h" |
| 8 #include "chrome/browser/sync/profile_sync_service_harness.h" | 8 #include "chrome/browser/sync/profile_sync_service_harness.h" |
| 9 #include "chrome/browser/sync/test/integration/search_engines_helper.h" | 9 #include "chrome/browser/sync/test/integration/search_engines_helper.h" |
| 10 #include "chrome/browser/sync/test/integration/sync_test.h" | 10 #include "chrome/browser/sync/test/integration/sync_test.h" |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 } | 104 } |
| 105 | 105 |
| 106 // TCM ID - 8906436. | 106 // TCM ID - 8906436. |
| 107 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, DisableSync) { | 107 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, DisableSync) { |
| 108 ASSERT_TRUE(SetupSync()); | 108 ASSERT_TRUE(SetupSync()); |
| 109 ASSERT_TRUE(AllServicesMatch()); | 109 ASSERT_TRUE(AllServicesMatch()); |
| 110 | 110 |
| 111 ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes()); | 111 ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes()); |
| 112 AddSearchEngine(0, 0); | 112 AddSearchEngine(0, 0); |
| 113 ASSERT_TRUE( | 113 ASSERT_TRUE( |
| 114 GetClient(0)->AwaitSyncCycleCompletion("Added a search engine.")); | 114 GetClient(0)->AwaitFullSyncCompletion("Added a search engine.")); |
| 115 ASSERT_TRUE(ServiceMatchesVerifier(0)); | 115 ASSERT_TRUE(ServiceMatchesVerifier(0)); |
| 116 ASSERT_FALSE(ServiceMatchesVerifier(1)); | 116 ASSERT_FALSE(ServiceMatchesVerifier(1)); |
| 117 | 117 |
| 118 ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes()); | 118 ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes()); |
| 119 ASSERT_TRUE(AwaitQuiescence()); | 119 ASSERT_TRUE(AwaitQuiescence()); |
| 120 ASSERT_TRUE(AllServicesMatch()); | 120 ASSERT_TRUE(AllServicesMatch()); |
| 121 } | 121 } |
| OLD | NEW |