Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

chrome/browser/ui/gtk/edit_search_engine_dialog.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/gtk/edit_search_engine_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
@@ skipping 13 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Forces text to lowercase when connected to an editable's "insert-text"
 // signal.  (Like views Textfield::STYLE_LOWERCASE.)
 void LowercaseInsertTextHandler(GtkEditable *editable, const gchar *text,
                                 gint length, gint *position, gpointer data) {
-  base::string16 original_text = UTF8ToUTF16(text);
+  base::string16 original_text = base::UTF8ToUTF16(text);
   base::string16 lower_text = base::i18n::ToLower(original_text);
   if (lower_text != original_text) {
-    std::string result = UTF16ToUTF8(lower_text);
+    std::string result = base::UTF16ToUTF8(lower_text);
     // Prevent ourselves getting called recursively about our own edit.
     g_signal_handlers_block_by_func(G_OBJECT(editable),
         reinterpret_cast<gpointer>(LowercaseInsertTextHandler), data);
     gtk_editable_insert_text(editable, result.c_str(), result.size(), position);
     g_signal_handlers_unblock_by_func(G_OBJECT(editable),
         reinterpret_cast<gpointer>(LowercaseInsertTextHandler), data);
     // We've inserted our modified version, stop the defalut handler from
     // inserting the original.
     g_signal_stop_emission_by_name(G_OBJECT(editable), "insert_text");
   }
@@ skipping 88 matching lines @@
   g_signal_connect(url_entry_, "changed",
                    G_CALLBACK(OnEntryChangedThunk), this);
 
   title_image_ = gtk_image_new_from_pixbuf(NULL);
   keyword_image_ = gtk_image_new_from_pixbuf(NULL);
   url_image_ = gtk_image_new_from_pixbuf(NULL);
 
   if (controller_->template_url()) {
     gtk_entry_set_text(
         GTK_ENTRY(title_entry_),
-        UTF16ToUTF8(controller_->template_url()->short_name()).c_str());
+        base::UTF16ToUTF8(controller_->template_url()->short_name()).c_str());
     gtk_entry_set_text(
         GTK_ENTRY(keyword_entry_),
-        UTF16ToUTF8(controller_->template_url()->keyword()).c_str());
+        base::UTF16ToUTF8(controller_->template_url()->keyword()).c_str());
     gtk_entry_set_text(
         GTK_ENTRY(url_entry_),
-        UTF16ToUTF8(controller_->template_url()->url_ref().DisplayURL()).
+        base::UTF16ToUTF8(controller_->template_url()->url_ref().DisplayURL()).
             c_str());
     // We don't allow users to edit prepopulated URLs.
     gtk_editable_set_editable(
         GTK_EDITABLE(url_entry_),
         controller_->template_url()->prepopulate_id() == 0);
 
     if (controller_->template_url()->prepopulate_id() != 0) {
       GtkWidget* fake_label = gtk_label_new("Fake label");
       gtk_widget_set_sensitive(fake_label,
           controller_->template_url()->prepopulate_id() == 0);
@@ skipping 46 matching lines @@
 
   EnableControls();
 
   gtk_util::ShowDialog(dialog_);
 
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
   g_signal_connect(dialog_, "destroy", G_CALLBACK(OnWindowDestroyThunk), this);
 }
 
 base::string16 EditSearchEngineDialog::GetTitleInput() const {
-  return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(title_entry_)));
+  return base::UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(title_entry_)));
 }
 
 base::string16 EditSearchEngineDialog::GetKeywordInput() const {
-  return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(keyword_entry_)));
+  return base::UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(keyword_entry_)));
 }
 
 std::string EditSearchEngineDialog::GetURLInput() const {
   return gtk_entry_get_text(GTK_ENTRY(url_entry_));
 }
 
 void EditSearchEngineDialog::EnableControls() {
   gtk_widget_set_sensitive(ok_button_,
                            controller_->IsKeywordValid(GetKeywordInput()) &&
                            controller_->IsTitleValid(GetTitleInput()) &&
@@ skipping 33 matching lines @@
                                  GetURLInput());
   } else {
     controller_->CleanUpCancelledAdd();
   }
   gtk_widget_destroy(dialog_);
 }
 
 void EditSearchEngineDialog::OnWindowDestroy(GtkWidget* widget) {
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }