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

chrome/browser/shell_integration_linux.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/shell_integration_linux.h"
 
 #include <fcntl.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ skipping 718 matching lines @@
 
   // See http://standards.freedesktop.org/desktop-entry-spec/latest/
   GKeyFile* key_file = g_key_file_new();
 
   // Set keys with fixed values.
   g_key_file_set_string(key_file, kDesktopEntry, "Version", "1.0");
   g_key_file_set_string(key_file, kDesktopEntry, "Terminal", "false");
   g_key_file_set_string(key_file, kDesktopEntry, "Type", "Application");
 
   // Set the "Name" key.
-  std::string final_title = UTF16ToUTF8(title);
+  std::string final_title = base::UTF16ToUTF8(title);
   // Make sure no endline characters can slip in and possibly introduce
   // additional lines (like Exec, which makes it a security risk). Also
   // use the URL as a default when the title is empty.
   if (final_title.empty() ||
       final_title.find("\n") != std::string::npos ||
       final_title.find("\r") != std::string::npos) {
     final_title = url.spec();
   }
   g_key_file_set_string(key_file, kDesktopEntry, "Name", final_title.c_str());
 
@@ skipping 49 matching lines @@
   return output_buffer;
 }
 
 std::string GetDirectoryFileContents(const base::string16& title,
                                      const std::string& icon_name) {
   // See http://standards.freedesktop.org/desktop-entry-spec/latest/
   GKeyFile* key_file = g_key_file_new();
 
   g_key_file_set_string(key_file, kDesktopEntry, "Version", "1.0");
   g_key_file_set_string(key_file, kDesktopEntry, "Type", "Directory");
-  std::string final_title = UTF16ToUTF8(title);
+  std::string final_title = base::UTF16ToUTF8(title);
   g_key_file_set_string(key_file, kDesktopEntry, "Name", final_title.c_str());
   if (!icon_name.empty()) {
     g_key_file_set_string(key_file, kDesktopEntry, "Icon", icon_name.c_str());
   } else {
     g_key_file_set_string(key_file, kDesktopEntry, "Icon",
                           GetIconName().c_str());
   }
 
   gsize length = 0;
   gchar* data_dump = g_key_file_to_data(key_file, &length, NULL);
@@ skipping 148 matching lines @@
     for (std::vector<base::FilePath>::const_iterator it =
          shortcut_filenames_app_menu.begin();
          it != shortcut_filenames_app_menu.end(); ++it) {
       DeleteShortcutInApplicationsMenu(*it,
                                        base::FilePath(kDirectoryFilename));
     }
   }
 }
 
 }  // namespace ShellIntegrationLinux