Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media…

extensions/common/error_utils.cc

 // Copyright (c) 2011 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 "extensions/common/error_utils.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace extensions {
@@ skipping 22 matching lines @@
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s3);
   return ret_val;
 }
 
 base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
                                                    const std::string& s1) {
   std::string ret_val = format;
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
-  return UTF8ToUTF16(ret_val);
+  return base::UTF8ToUTF16(ret_val);
 }
 
 base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
                                                    const std::string& s1,
                                                    const std::string& s2) {
   std::string ret_val = format;
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
-  return UTF8ToUTF16(ret_val);
+  return base::UTF8ToUTF16(ret_val);
 }
 
 base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
                                                    const std::string& s1,
                                                    const std::string& s2,
                                                    const std::string& s3) {
   std::string ret_val = format;
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s3);
-  return UTF8ToUTF16(ret_val);
+  return base::UTF8ToUTF16(ret_val);
 }
 
 }  // namespace