Revert 184837

chrome/renderer/extensions/extension_helper.cc

 // Copyright (c) 2012 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/renderer/extensions/extension_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 491 matching lines @@
   // some alternative way to transmit the icon data to the browser process.
   //
   // See also: bug 63729.
   const size_t kMaxIconSize = 1024 * 128;
   size_t actual_icon_size = 0;
   for (size_t i = 0; i < pending_app_info_->icons.size(); ++i) {
     size_t current_size = pending_app_info_->icons[i].data.getSize();
     if (current_size > kMaxIconSize - actual_icon_size) {
       AddMessageToRootConsole(
           content::CONSOLE_MESSAGE_LEVEL_ERROR,
-          "Icons are too large. Maximum total size for app icons is 128 KB.");
+          ASCIIToUTF16("Icons are too large. "
+              "Maximum total size for app icons is 128 KB."));
       return;
     }
     actual_icon_size += current_size;
   }
 
   Send(new ExtensionHostMsg_InstallApplication(
       routing_id(), *pending_app_info_));
   pending_app_info_.reset(NULL);
 }
 
 void ExtensionHelper::AddMessageToRootConsole(ConsoleMessageLevel level,
-                                              const std::string& message) {
-  AddMessageToRootConsole(level, ASCIIToUTF16(message));
-}
-
-void ExtensionHelper::AddMessageToRootConsole(ConsoleMessageLevel level,
                                               const string16& message) {
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     WebConsoleMessage::Level target_level = WebConsoleMessage::LevelLog;
     switch (level) {
       case content::CONSOLE_MESSAGE_LEVEL_DEBUG:
         target_level = WebConsoleMessage::LevelDebug;
         break;
       case content::CONSOLE_MESSAGE_LEVEL_LOG:
         target_level = WebConsoleMessage::LevelLog;
         break;
       case content::CONSOLE_MESSAGE_LEVEL_WARNING:
         target_level = WebConsoleMessage::LevelWarning;
         break;
       case content::CONSOLE_MESSAGE_LEVEL_ERROR:
         target_level = WebConsoleMessage::LevelError;
         break;
     }
     render_view()->GetWebView()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(target_level, message));
   }
 }
 
 }  // namespace extensions