| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/strings/utf_string_conversions.h" | 5 #include "base/strings/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/search_engines/template_url_service_factory.h" | 8 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 9 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 9 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 10 #include "chrome/browser/sync/test/integration/search_engines_helper.h" | 10 #include "chrome/browser/sync/test/integration/search_engines_helper.h" |
| 11 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 11 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
| 12 #include "chrome/browser/sync/test/integration/sync_test.h" | 12 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 13 | 13 |
| 14 using base::ASCIIToUTF16; |
| 15 |
| 14 class TwoClientSearchEnginesSyncTest : public SyncTest { | 16 class TwoClientSearchEnginesSyncTest : public SyncTest { |
| 15 public: | 17 public: |
| 16 TwoClientSearchEnginesSyncTest() : SyncTest(TWO_CLIENT) {} | 18 TwoClientSearchEnginesSyncTest() : SyncTest(TWO_CLIENT) {} |
| 17 virtual ~TwoClientSearchEnginesSyncTest() {} | 19 virtual ~TwoClientSearchEnginesSyncTest() {} |
| 18 | 20 |
| 19 private: | 21 private: |
| 20 DISALLOW_COPY_AND_ASSIGN(TwoClientSearchEnginesSyncTest); | 22 DISALLOW_COPY_AND_ASSIGN(TwoClientSearchEnginesSyncTest); |
| 21 }; | 23 }; |
| 22 | 24 |
| 23 // TCM ID - 8898628. | 25 // TCM ID - 8898628. |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 232 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 231 ASSERT_TRUE(search_engines_helper::AllServicesMatch()); | 233 ASSERT_TRUE(search_engines_helper::AllServicesMatch()); |
| 232 | 234 |
| 233 // Change the default on the first client and delete the old default. | 235 // Change the default on the first client and delete the old default. |
| 234 search_engines_helper::ChangeDefaultSearchProvider(0, 1); | 236 search_engines_helper::ChangeDefaultSearchProvider(0, 1); |
| 235 search_engines_helper::DeleteSearchEngineBySeed(0, 0); | 237 search_engines_helper::DeleteSearchEngineBySeed(0, 0); |
| 236 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 238 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 237 | 239 |
| 238 ASSERT_TRUE(search_engines_helper::AllServicesMatch()); | 240 ASSERT_TRUE(search_engines_helper::AllServicesMatch()); |
| 239 } | 241 } |
| OLD | NEW |