summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/keyword_provider.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 21:21:36 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 21:21:36 +0000
commit4bf413576fa9c6e19a16119b007112f7a32c6ffc (patch)
tree4f001c33aff643657dbea57da0f944e01c36fa9b /chrome/browser/autocomplete/keyword_provider.cc
parent2f4a6c55fc37dc085adaf808d1f436be91c82a09 (diff)
downloadchromium_src-4bf413576fa9c6e19a16119b007112f7a32c6ffc.zip
chromium_src-4bf413576fa9c6e19a16119b007112f7a32c6ffc.tar.gz
chromium_src-4bf413576fa9c6e19a16119b007112f7a32c6ffc.tar.bz2
chrome 1: string_util.h -> utf_string_conversions.h fix.
BUG=none TEST=none Review URL: http://codereview.chromium.org/672001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/keyword_provider.cc')
-rw-r--r--chrome/browser/autocomplete/keyword_provider.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc
index 68f59ff..dcab1c3 100644
--- a/chrome/browser/autocomplete/keyword_provider.cc
+++ b/chrome/browser/autocomplete/keyword_provider.cc
@@ -8,7 +8,7 @@
#include <vector>
#include "app/l10n_util.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_model.h"
@@ -166,7 +166,7 @@ std::wstring KeywordProvider::SplitKeywordFromInput(
// Find end of first token. The AutocompleteController has trimmed leading
// whitespace, so we need not skip over that.
const size_t first_white(input.find_first_of(kWhitespaceWide));
- DCHECK(first_white != 0);
+ DCHECK_NE(0U, first_white);
if (first_white == std::wstring::npos)
return input; // Only one token provided.