diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 21:00:36 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 21:00:36 +0000 |
| commit | 536d6212329a01aa26573f072ef9c803a3642d6a (patch) | |
| tree | fb32f453d1d02a14d1fe31f84b50b4850ac6bf99 /chrome | |
| parent | 80fbcff9fafb469c027aeca6788c7550f325e233 (diff) | |
| download | chromium_src-536d6212329a01aa26573f072ef9c803a3642d6a.zip chromium_src-536d6212329a01aa26573f072ef9c803a3642d6a.tar.gz chromium_src-536d6212329a01aa26573f072ef9c803a3642d6a.tar.bz2 | |
Fully enable history_url_provider_unittest.cc for Mac.
gfx::GetCleanStringFromUrl() got implemented for Mac at some point (I
suspect when fonts landed), so now all of this code should be
portable.
There is a slight difference in how ElideUrl() works, due to font
metric differences, but that should not be relevant to this code.
Review URL: http://codereview.chromium.org/42513
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autocomplete/history_url_provider.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/history_url_provider_unittest.cc | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc index 25f53a6..96b3e26 100644 --- a/chrome/browser/autocomplete/history_url_provider.cc +++ b/chrome/browser/autocomplete/history_url_provider.cc @@ -805,14 +805,9 @@ AutocompleteMatch HistoryURLProvider::HistoryMatchToACMatch( CalculateRelevance(params->input.type(), match_type, match_number), !!info.visit_count(), AutocompleteMatch::HISTORY_URL); match.destination_url = info.url(); -#if !defined(OS_MACOSX) match.fill_into_edit = gfx::GetCleanStringFromUrl(info.url(), match_type == WHAT_YOU_TYPED ? std::wstring() : params->languages, NULL, NULL); -#else - // TODO(port): GetCleanStringFromUrl() not implemented on mac. - NOTIMPLEMENTED(); -#endif if (!params->input.prevent_inline_autocomplete()) { match.inline_autocomplete_offset = history_match.input_location + params->input.text().length(); diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index a178ac5..6f12cc9 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -325,7 +325,6 @@ TEST_F(HistoryURLProviderTest, Fixup) { const std::string crash_1[] = {"http://%20/"}; RunTest(L"%20", std::wstring(), false, crash_1, arraysize(crash_1)); -#if defined(OS_WIN) // Fixing up "file:" should result in an inline autocomplete offset of just // after "file:", not just after "file://". const std::wstring input_1(L"file:"); @@ -348,9 +347,4 @@ TEST_F(HistoryURLProviderTest, Fixup) { // rather than "0.0.0.56.com". std::string fixup_3[] = {"http://www.56.com/"}; RunTest(L"56", L"com", true, fixup_3, arraysize(fixup_3)); -#elif defined(OS_POSIX) - // TODO(port): Fix this up once the dependencies have their UI bits - // extracted away. - NOTIMPLEMENTED(); -#endif } |