Merge 34957 - Fixes crash when message IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY...

chrome/browser/extensions/extensions_ui.cc

 // Copyright (c) 2006-2009 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/extensions/extensions_ui.h"
 
 #include "app/gfx/codec/png_codec.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
@@ skipping 475 matching lines @@
   }
 
   pack_job_ = new PackExtensionJob(this, root_directory, key_file);
   pack_job_->Start();
 }
 
 void ExtensionsDOMHandler::OnPackSuccess(const FilePath& crx_file,
                                          const FilePath& pem_file) {
   std::string message;
   if (!pem_file.empty()) {
-    message = WideToASCII(l10n_util::GetStringF(
+    message = WideToUTF8(l10n_util::GetStringF(
         IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_NEW,
         crx_file.ToWStringHack(),
         pem_file.ToWStringHack()));
   } else {
-    message = WideToASCII(l10n_util::GetStringF(
+    message = WideToUTF8(l10n_util::GetStringF(
         IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_UPDATE,
         crx_file.ToWStringHack()));
   }
   ShowAlert(message);
 
   ListValue results;
   dom_ui_->CallJavascriptFunction(L"hidePackDialog", results);
 }
 
 void ExtensionsDOMHandler::OnPackFailure(const std::wstring& error) {
@@ skipping 235 matching lines @@
 // static
 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadImageResourceBytes(IDR_PLUGIN);
 }
 
 // static
 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false);
 }