Use WebConsoleMessage instead of ConsoleMessageLevel.

R=dglazkov

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

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

2 files changed, 7 insertions, 10 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 29f6340..d2c052c 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -85,6 +85,7 @@
 
 using base::TimeDelta;
 using webkit_glue::WebAccessibility;
+using WebKit::WebConsoleMessage;
 using WebKit::WebScriptSource;
 
 //-----------------------------------------------------------------------------
@@ -465,7 +466,7 @@ void RenderView::PrintPage(const ViewMsg_PrintPage_Params& params,
   DCHECK(hdc);
   skia::PlatformDeviceWin::InitializeDC(hdc);
   // Since WebKit extends the page width depending on the magical shrink
-  // factor we make sure the canvas covers the worst case scenario 
+  // factor we make sure the canvas covers the worst case scenario
   // (x2.0 currently).  PrintContext will then set the correct clipping region.
   int size_x = static_cast<int>(canvas_size.width() * params.params.max_shrink);
   int size_y = static_cast<int>(canvas_size.height() *
@@ -2464,13 +2465,10 @@ void RenderView::OnCSSInsertRequest(const std::wstring& frame_xpath,
 }
 
 void RenderView::OnAddMessageToConsole(const std::wstring& frame_xpath,
-                                       const std::wstring& msg,
-                                       ConsoleMessageLevel level) {
+                                       const WebConsoleMessage& message) {
   WebFrame* web_frame = GetChildFrame(frame_xpath);
-  if (!web_frame)
-    return;
-
-  web_frame->AddMessageToConsole(msg, level);
+  if (web_frame)
+    web_frame->AddMessageToConsole(message);
 }
 
 #if defined(OS_WIN)
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index a9b4b9a..d6bf327 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -26,7 +26,6 @@
 #include "chrome/renderer/render_widget.h"
 #include "media/audio/audio_output.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
-#include "webkit/glue/console_message_level.h"
 #include "webkit/glue/dom_serializer_delegate.h"
 #include "webkit/glue/feed.h"
 #include "webkit/glue/form_data.h"
@@ -75,6 +74,7 @@ struct FileUploadData;
 }
 
 namespace WebKit {
+struct WebConsoleMessage;
 struct WebFindInPageRequest;
 }
 
@@ -519,8 +519,7 @@ class RenderView : public RenderWidget,
   void OnCSSInsertRequest(const std::wstring& frame_xpath,
                           const std::string& css);
   void OnAddMessageToConsole(const std::wstring& frame_xpath,
-                             const std::wstring& msg,
-                             ConsoleMessageLevel level);
+                             const WebKit::WebConsoleMessage&);
   void OnDebugAttach();
 
   void OnReservePageIDRange(int size_of_range);