diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 06:34:13 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 06:34:13 +0000 |
| commit | 6524385ef3fb2f1f26675d66cee2dad649883be6 (patch) | |
| tree | c0f807e54894299399da67834a1980534daa1a2d /chrome/browser/autocomplete | |
| parent | f51ef0d27f701feb2c47096c9a73039e0c389a60 (diff) | |
| download | chromium_src-6524385ef3fb2f1f26675d66cee2dad649883be6.zip chromium_src-6524385ef3fb2f1f26675d66cee2dad649883be6.tar.gz chromium_src-6524385ef3fb2f1f26675d66cee2dad649883be6.tar.bz2 | |
Remove wstrings from bookmarks, part 1 (of many).
Start by removing wstring versions of BookmarkModel::AddURLWithCreationTime()
and BookmarkModel::SetURLStarred().
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3111012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/history_contents_provider_unittest.cc | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc index e267f3c..230c62a 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc @@ -10,6 +10,7 @@ #include "base/message_loop.h" #include "base/platform_thread.h" #include "base/ref_counted.h" +#include "base/string16.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -236,7 +237,7 @@ class AutocompleteEditViewTest : public InProcessBrowserTest, cur.typed_count, t, false); history_service->SetPageContents(url, UTF8ToUTF16(cur.body)); if (cur.starred) { - bookmark_model->SetURLStarred(url, std::wstring(), true); + bookmark_model->SetURLStarred(url, string16(), true); } } } diff --git a/chrome/browser/autocomplete/history_contents_provider_unittest.cc b/chrome/browser/autocomplete/history_contents_provider_unittest.cc index 124a9a2..9212bce 100644 --- a/chrome/browser/autocomplete/history_contents_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_contents_provider_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -157,7 +157,8 @@ TEST_F(HistoryContentsProviderTest, Bookmarks) { // Add a bookmark. GURL bookmark_url("http://www.google.com/4"); - profile()->GetBookmarkModel()->SetURLStarred(bookmark_url, L"bar", true); + profile()->GetBookmarkModel()->SetURLStarred(bookmark_url, + ASCIIToUTF16("bar"), true); // Ask for synchronous. This should only get the bookmark. AutocompleteInput sync_input(L"bar", std::wstring(), true, false, true); |