| 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/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "base/time.h" | 8 #include "base/time.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/search_engines/search_terms_data.h" | 10 #include "chrome/browser/search_engines/search_terms_data.h" |
| 11 #include "chrome/browser/search_engines/template_url.h" | 11 #include "chrome/browser/search_engines/template_url.h" |
| 12 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 12 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 13 #include "chrome/browser/search_engines/template_url_service.h" | 13 #include "chrome/browser/search_engines/template_url_service.h" |
| 14 #include "chrome/browser/search_engines/template_url_service_factory.h" | 14 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 15 #include "chrome/browser/search_engines/template_url_service_test_util.h" | 15 #include "chrome/browser/search_engines/template_url_service_test_util.h" |
| 16 #include "chrome/common/chrome_notification_types.h" | 16 #include "chrome/common/chrome_notification_types.h" |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "chrome/common/url_constants.h" | 18 #include "chrome/common/url_constants.h" |
| 19 #include "chrome/test/base/testing_pref_service.h" | 19 #include "chrome/test/base/testing_pref_service_syncable.h" |
| 20 #include "chrome/test/base/testing_profile.h" | 20 #include "chrome/test/base/testing_profile.h" |
| 21 #include "content/public/browser/notification_service.h" | 21 #include "content/public/browser/notification_service.h" |
| 22 #include "extensions/common/constants.h" | 22 #include "extensions/common/constants.h" |
| 23 #include "net/base/net_util.h" | 23 #include "net/base/net_util.h" |
| 24 #include "sync/api/sync_error_factory.h" | 24 #include "sync/api/sync_error_factory.h" |
| 25 #include "sync/api/sync_error_factory_mock.h" | 25 #include "sync/api/sync_error_factory_mock.h" |
| 26 #include "sync/protocol/search_engine_specifics.pb.h" | 26 #include "sync/protocol/search_engine_specifics.pb.h" |
| 27 #include "sync/protocol/sync.pb.h" | 27 #include "sync/protocol/sync.pb.h" |
| 28 #include "testing/gtest/include/gtest/gtest.h" | 28 #include "testing/gtest/include/gtest/gtest.h" |
| 29 | 29 |
| (...skipping 2235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2265 syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing( | 2265 syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing( |
| 2266 syncer::SEARCH_ENGINES, list, PassProcessor(), | 2266 syncer::SEARCH_ENGINES, list, PassProcessor(), |
| 2267 CreateAndPassSyncErrorFactory()); | 2267 CreateAndPassSyncErrorFactory()); |
| 2268 | 2268 |
| 2269 const TemplateURL* result_turl = model()->GetTemplateURLForGUID("default"); | 2269 const TemplateURL* result_turl = model()->GetTemplateURLForGUID("default"); |
| 2270 EXPECT_TRUE(result_turl); | 2270 EXPECT_TRUE(result_turl); |
| 2271 EXPECT_EQ(default_turl->keyword(), result_turl->keyword()); | 2271 EXPECT_EQ(default_turl->keyword(), result_turl->keyword()); |
| 2272 EXPECT_EQ(default_turl->short_name(), result_turl->short_name()); | 2272 EXPECT_EQ(default_turl->short_name(), result_turl->short_name()); |
| 2273 EXPECT_EQ(default_turl->url(), result_turl->url()); | 2273 EXPECT_EQ(default_turl->url(), result_turl->url()); |
| 2274 } | 2274 } |
| OLD | NEW |