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

extensions/common/manifest_handlers/background_info.cc

 // Copyright 2013 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/manifest_handlers/background_info.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/file_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/permissions/api_permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using base::ASCIIToUTF16;
 using base::DictionaryValue;
 
 namespace extensions {
 
 namespace keys = manifest_keys;
 namespace values = manifest_values;
 namespace errors = manifest_errors;
 
 namespace {
 
@@ skipping 235 matching lines @@
     std::string* error,
     std::vector<InstallWarning>* warnings) const {
   // Validate that background scripts exist.
   const std::vector<std::string>& background_scripts =
       BackgroundInfo::GetBackgroundScripts(extension);
   for (size_t i = 0; i < background_scripts.size(); ++i) {
     if (!base::PathExists(
             extension->GetResource(background_scripts[i]).GetFilePath())) {
       *error = l10n_util::GetStringFUTF8(
           IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED,
-          UTF8ToUTF16(background_scripts[i]));
+          base::UTF8ToUTF16(background_scripts[i]));
       return false;
     }
   }
 
   // Validate background page location, except for hosted apps, which should use
   // an external URL. Background page for hosted apps are verified when the
   // extension is created (in Extension::InitFromValue)
   if (BackgroundInfo::HasBackgroundPage(extension) &&
       !extension->is_hosted_app() && background_scripts.empty()) {
     base::FilePath page_path = file_util::ExtensionURLToRelativeFilePath(
@@ skipping 21 matching lines @@
     keys::kBackgroundPageLegacy,
     keys::kBackgroundPersistent,
     keys::kBackgroundScripts,
     keys::kPlatformAppBackgroundPage,
     keys::kPlatformAppBackgroundScripts
   };
   return std::vector<std::string>(keys, keys + arraysize(keys));
 }
 
 }  // namespace extensions