Merge 188631 "Don't throw exceptions when v8 objects/contexts ar..."

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"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/view_type.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
+#include "chrome/renderer/extensions/console.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
 #include "chrome/renderer/extensions/user_script_scheduler.h"
 #include "chrome/renderer/extensions/user_script_slave.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "extensions/common/constants.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ skipping 327 matching lines @@
   CHECK_GE(init_tab_id, 0);
   tab_id_ = init_tab_id;
 }
 
 void ExtensionHelper::OnUpdateBrowserWindowId(int window_id) {
   browser_window_id_ = window_id;
 }
 
 void ExtensionHelper::OnAddMessageToConsole(ConsoleMessageLevel level,
                                             const std::string& message) {
-  AddMessageToRootConsole(level, UTF8ToUTF16(message));
+  console::AddMessage(render_view(), level, message);
 }
 
 void ExtensionHelper::OnAppWindowClosed() {
   v8::HandleScope scope;
   v8::Handle<v8::Context> script_context =
       render_view()->GetWebView()->mainFrame()->mainWorldScriptContext();
   ChromeV8Context* chrome_v8_context =
       dispatcher_->v8_context_set().GetByV8Context(script_context);
   if (!chrome_v8_context)
     return;
   chrome_v8_context->CallChromeHiddenMethod("OnAppWindowClosed", 0, NULL, 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