| 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 <stddef.h> |
| 6 |
| 5 #include <string> | 7 #include <string> |
| 6 | 8 |
| 7 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 8 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| 11 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
| 11 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 13 #include "chrome/browser/search_engines/template_url_service_test_util.h" | 16 #include "chrome/browser/search_engines/template_url_service_test_util.h" |
| 14 #include "chrome/test/base/testing_profile.h" | 17 #include "chrome/test/base/testing_profile.h" |
| 15 #include "components/search_engines/template_url.h" | 18 #include "components/search_engines/template_url.h" |
| 16 #include "components/search_engines/template_url_fetcher.h" | 19 #include "components/search_engines/template_url_fetcher.h" |
| 17 #include "components/search_engines/template_url_service.h" | 20 #include "components/search_engines/template_url_service.h" |
| 18 #include "content/public/test/test_browser_thread_bundle.h" | 21 #include "content/public/test/test_browser_thread_bundle.h" |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 | 338 |
| 336 std::string osdd_file_name("unicode_open_search.xml"); | 339 std::string osdd_file_name("unicode_open_search.xml"); |
| 337 StartDownload(keyword, osdd_file_name, | 340 StartDownload(keyword, osdd_file_name, |
| 338 TemplateURLFetcher::AUTODETECTED_PROVIDER, true); | 341 TemplateURLFetcher::AUTODETECTED_PROVIDER, true); |
| 339 WaitForDownloadToFinish(); | 342 WaitForDownloadToFinish(); |
| 340 const TemplateURL* t_url = | 343 const TemplateURL* t_url = |
| 341 test_util()->model()->GetTemplateURLForKeyword(keyword); | 344 test_util()->model()->GetTemplateURLForKeyword(keyword); |
| 342 EXPECT_EQ(base::UTF8ToUTF16("\xd1\x82\xd0\xb5\xd1\x81\xd1\x82"), | 345 EXPECT_EQ(base::UTF8ToUTF16("\xd1\x82\xd0\xb5\xd1\x81\xd1\x82"), |
| 343 t_url->short_name()); | 346 t_url->short_name()); |
| 344 } | 347 } |
| OLD | NEW |