Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3....

chrome/browser/extensions/pack_extension_job.cc

 // Copyright (c) 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/pack_extension_job.h"
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
+#include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/task.h"
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/common/chrome_constants.h"
 #include "grit/generated_resources.h"
 
 PackExtensionJob::PackExtensionJob(Client* client,
                                    const FilePath& root_directory,
                                    const FilePath& key_file)
     : client_(client), key_file_(key_file), asynchronous_(true) {
@@ skipping 54 matching lines @@
   if (client_)
     client_->OnPackSuccess(crx_file_out_, key_file_out_);
 }
 
 void PackExtensionJob::ReportFailureOnClientThread(const std::string& error) {
   if (client_)
     client_->OnPackFailure(error);
 }
 
 // static
-std::wstring PackExtensionJob::StandardSuccessMessage(const FilePath& crx_file,
-                                                      const FilePath& key_file)
-{
-  // TODO(isherman): we should use string16 instead of wstring.
-  // See crbug.com/23581 and crbug.com/24672
-  std::wstring message;
-  if (key_file.empty()) {
-    return l10n_util::GetStringF(
+string16 PackExtensionJob::StandardSuccessMessage(const FilePath& crx_file,
+                                                  const FilePath& key_file) {
+  string16 crx_file_string = WideToUTF16(crx_file.ToWStringHack());
+  string16 key_file_string = WideToUTF16(key_file.ToWStringHack());
+  if (key_file_string.empty()) {
+    return l10n_util::GetStringFUTF16(
         IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_UPDATE,
-        crx_file.ToWStringHack());
+        crx_file_string);
   } else {
-    return l10n_util::GetStringF(
+    return l10n_util::GetStringFUTF16(
         IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_NEW,
-        crx_file.ToWStringHack(),
-        key_file.ToWStringHack());
+        crx_file_string,
+        key_file_string);
   }
 }