chrome 2: string_util.h -> utf_string_conversions.h fix.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/672007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40945 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 11 insertions, 7 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 74fd71f..95b4b42 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 083f6a2..407ed10 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -15,7 +15,7 @@
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
index 773a809..8d42889 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
@@ -7,6 +7,7 @@
 #include <gtk/gtk.h>
 
 #include <algorithm>
+#include <string>
 
 #include "app/gfx/font.h"
 #include "app/gfx/gtk_util.h"
@@ -15,7 +16,7 @@
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
diff --git a/chrome/browser/autocomplete/autocomplete_unittest.cc b/chrome/browser/autocomplete/autocomplete_unittest.cc
index 0e8671a..2507310 100644
--- a/chrome/browser/autocomplete/autocomplete_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
@@ -63,7 +64,7 @@ void TestProvider::Start(const AutocompleteInput& input,
 }
 
 void TestProvider::Run() {
-  DCHECK(num_results_per_provider > 0);
+  DCHECK_GT(num_results_per_provider, 0U);
   AddResults(1, num_results_per_provider);
   done_ = true;
   DCHECK(listener_);
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 2683e2c..044431b 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -4,11 +4,13 @@
 
 #include "chrome/browser/autocomplete/search_provider.h"
 
+#include <algorithm>
+
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google_util.h"
@@ -138,7 +140,7 @@ void SearchProvider::Run() {
   }
   // We should only get here if we have a suggest url for the keyword or default
   // providers.
-  DCHECK(suggest_results_pending_ > 0);
+  DCHECK_GT(suggest_results_pending_, 0);
 }
 
 void SearchProvider::Stop() {
@@ -155,7 +157,7 @@ void SearchProvider::OnURLFetchComplete(const URLFetcher* source,
                                         const std::string& data) {
   DCHECK(!done_);
   suggest_results_pending_--;
-  DCHECK(suggest_results_pending_ >= 0);  // Should never go negative.
+  DCHECK_GE(suggest_results_pending_, 0);  // Should never go negative.
   const net::HttpResponseHeaders* const response_headers =
       source->response_headers();
   std::string json_data(data);