Hook up WebViewClient, part 1....

webkit/tools/test_shell/layout_test_controller.cc

 // Copyright (c) 2006-2008 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.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "webkit/api/public/WebConsoleMessage.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using std::string;
 using std::wstring;
 
+using WebKit::WebConsoleMessage;
 using WebKit::WebScriptSource;
 using WebKit::WebString;
 
 #if defined(OS_WIN)
 namespace {
 
 // Stops the test from running and prints a brief warning to stdout.  Called
 // when the timer for loading a layout test expires.
 VOID CALLBACK TestTimeout(HWND hwnd, UINT msg, UINT_PTR timer_id, DWORD ms) {
   puts("#TEST_TIMED_OUT\n");
@@ skipping 791 matching lines @@
     return value.ToBoolean();
   else if (value.isInt32())
     return 0 != value.ToInt32();
   else if (value.isString()) {
     std::string valueString = value.ToString();
     if (valueString == "true")
       return true;
     if (valueString == "false")
       return false;
   }
-  shell_->delegate()->AddMessageToConsole(shell_->webView(),
-      L"Invalid value. Expected boolean value.", 0, L"");
+  LogErrorToConsole("Invalid value. Expected boolean value.");
   return false;
 }
 
 int32 LayoutTestController::CppVariantToInt32(const CppVariant& value) {
     if (value.isInt32())
     return value.ToInt32();
   else if (value.isString()) {
     int number;
     if (StringToInt(value.ToString(), &number))
       return number;
   }
-  shell_->delegate()->AddMessageToConsole(shell_->webView(),
-      L"Invalid value for preference. Expected integer value.", 0, L"");
+  LogErrorToConsole("Invalid value for preference. Expected integer value.");
   return 0;
 }
 
 std::wstring LayoutTestController::CppVariantToWstring(
     const CppVariant& value) {
   if (value.isString())
     return UTF8ToWide(value.ToString());
-  shell_->delegate()->AddMessageToConsole(shell_->webView(),
-      L"Invalid value for preference. Expected string value.", 0, L"");
+  LogErrorToConsole("Invalid value for preference. Expected string value.");
   return std::wstring();
 }
 
 void LayoutTestController::overridePreference(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() == 2 && args[0].isString()) {
     std::string key = args[0].ToString();
     CppVariant value = args[1];
     WebPreferences* preferences = shell_->GetWebPreferences();
     if (key == "WebKitStandardFont")
@@ skipping 41 matching lines @@
       preferences->java_enabled = CppVariantToBool(value);
     else if (key == "WebKitUsesPageCachePreferenceKey")
       preferences->uses_page_cache = CppVariantToBool(value);
     else if (key == "WebKitXSSAuditorEnabled")
       preferences->xss_auditor_enabled = CppVariantToBool(value);
     else if (key == "WebKitLocalStorageEnabledPreferenceKey")
       preferences->local_storage_enabled = CppVariantToBool(value);
     else if (key == "WebKitOfflineWebApplicationCacheEnabled")
       preferences->application_cache_enabled = CppVariantToBool(value);
     else {
-      std::wstring message(L"Invalid name for preference: ");
-      message.append(ASCIIToWide(key));
-      shell_->delegate()->AddMessageToConsole(shell_->webView(),
-                                              message, 0, L"");
+      std::string message("Invalid name for preference: ");
+      message.append(key);
+      LogErrorToConsole(message);
     }
     preferences->Apply(shell_->webView());
   }
   result->SetNull();
 }
 
 void LayoutTestController::fallbackMethod(
     const CppArgumentList& args, CppVariant* result) {
   std::wstring message(L"JavaScript ERROR: unknown method called on LayoutTestController");
   if (!shell_->layout_test_mode()) {
@@ skipping 15 matching lines @@
 
   WebKit::WebURL url(GURL(args[0].ToString()));
   if (!url.isValid())
     return;
 
   WebKit::whiteListAccessFromOrigin(url,
                                     WebString::fromUTF8(args[1].ToString()),
                                     WebString::fromUTF8(args[2].ToString()),
                                     args[3].ToBoolean());
 }
+
+void LayoutTestController::LogErrorToConsole(const std::string& text) {
+  shell_->webView()->GetMainFrame()->addMessageToConsole(
+      WebConsoleMessage(WebConsoleMessage::LevelError,
+                        WebString::fromUTF8(text)));
+}