Add console message levels to test expectation output.

Source/testing/runner/WebTestProxy.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1395 matching lines @@
         m_delegate->printMessage(" - didFinishLoading\n");
     }
     m_resourceIdentifierMap.erase(identifier);
 }
 
 void WebTestProxyBase::didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine)
 {
     // This matches win DumpRenderTree's UIDelegate.cpp.
     if (!m_logConsoleOutput)
         return;
-    m_delegate->printMessage(string("CONSOLE MESSAGE: "));
+    string level;
+    switch (message.level) {
+    case WebConsoleMessage::LevelDebug:
+        level = "DEBUG";
+        break;
+    case WebConsoleMessage::LevelLog:
+        level = "LOG";

[jochen (gone - plz use gerrit), 2013/10/10 09:44:43]

maybe use MESSAGE here to minimize the number of tests you need to rebase?

+        break;
+    case WebConsoleMessage::LevelWarning:
+        level = "WARNING";
+        break;
+    case WebConsoleMessage::LevelError:
+        level = "ERROR";
+        break;
+    }
+    m_delegate->printMessage(string("CONSOLE ") + level + ": ");
     if (sourceLine) {
         char buffer[40];
         snprintf(buffer, sizeof(buffer), "line %d: ", sourceLine);
         m_delegate->printMessage(buffer);
     }
     if (!message.text.isEmpty()) {
         string newMessage;
         newMessage = message.text.utf8();
         size_t fileProtocol = newMessage.find("file://");
         if (fileProtocol != string::npos) {
@@ skipping 64 matching lines @@
 
 void WebTestProxyBase::resetInputMethod()
 {
     // If a composition text exists, then we need to let the browser process
     // to cancel the input method's ongoing composition session.
     if (m_webWidget)
         m_webWidget->confirmComposition();
 }
 
 }