Fix two incorrect uses of string conversion to/from ASCII when strings in

questions can contain non-ASCII characters. 

They lead the error message to be garbled and an non-ASCII path to turn
empty. 

BUG=44145,45009
TEST=See bugs

Review URL: http://codereview.chromium.org/2148004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48413 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index fda3849..ca5c656 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -567,17 +567,16 @@ void ExtensionsDOMHandler::ShowAlert(const std::string& message) {
 }
 
 void ExtensionsDOMHandler::HandlePackMessage(const Value* value) {
-  std::string extension_path;
-  std::string private_key_path;
+  std::wstring extension_path;
+  std::wstring private_key_path;
   CHECK(value->IsType(Value::TYPE_LIST));
   const ListValue* list = static_cast<const ListValue*>(value);
   CHECK(list->GetSize() == 2);
   CHECK(list->GetString(0, &extension_path));
   CHECK(list->GetString(1, &private_key_path));
 
-  FilePath root_directory = FilePath::FromWStringHack(ASCIIToWide(
-      extension_path));
-  FilePath key_file = FilePath::FromWStringHack(ASCIIToWide(private_key_path));
+  FilePath root_directory = FilePath::FromWStringHack(extension_path);
+  FilePath key_file = FilePath::FromWStringHack(private_key_path);
 
   if (root_directory.empty()) {
     if (extension_path.empty()) {
@@ -621,7 +620,7 @@ void ExtensionsDOMHandler::OnPackSuccess(const FilePath& crx_file,
 }
 
 void ExtensionsDOMHandler::OnPackFailure(const std::wstring& error) {
-  ShowAlert(WideToASCII(error));
+  ShowAlert(WideToUTF8(error));
 }
 
 void ExtensionsDOMHandler::HandleAutoUpdateMessage(const Value* value) {