Chromium changes to use new WebKit, WebKitClient, and WebClipboard interfaces...

webkit/tools/test_shell/test_shell_main.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.
 
 // Creates an instance of the test_shell.
 #include "build/build_config.h"
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/event_recorder.h"
 #include "base/file_util.h"
 #include "base/icu_util.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/stats_table.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/trace_event.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_module.h"
 #include "net/http/http_cache.h"
 #include "net/base/ssl_test_util.h"
 #include "net/url_request/url_request_context.h"
+#include "webkit/glue/webkit_client_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_shell_platform_delegate.h"
 #include "webkit/tools/test_shell/test_shell_request_context.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 
+#include "WebKit.h"
+
 #include <iostream>
 using namespace std;
 
 static const size_t kPathBufSize = 2048;
 
 namespace {
 
 // StatsTable initialization parameters.
 static const char* kStatsFilePrefix = "testshell_";
 static int kStatsFileThreads = 20;
@@ skipping 32 matching lines @@
   bool layout_test_mode =
       parsed_command_line.HasSwitch(test_shell::kLayoutTests);
 
   bool enable_gp_fault_error_box = false;
   enable_gp_fault_error_box =
       parsed_command_line.HasSwitch(test_shell::kGPFaultErrorBox);
   TestShell::InitLogging(suppress_error_dialogs,
                          layout_test_mode,
                          enable_gp_fault_error_box);
 
+  webkit_glue::WebKitClientImpl webkit_client_impl;
+  WebKit::initialize(&webkit_client_impl);
+
   // Set this early before we start using WebCore.
   webkit_glue::SetLayoutTestMode(layout_test_mode);
 
   // Suppress abort message in v8 library in debugging mode.
   // V8 calls abort() when it hits assertion errors.
   if (suppress_error_dialogs) {
     platform.SuppressErrorReporting();
   }
 
   if (parsed_command_line.HasSwitch(test_shell::kEnableTracing))
@@ skipping 189 matching lines @@
 
   TestShell::ShutdownTestShell();
   TestShell::CleanupLogging();
 
   // Tear down shared StatsTable; prevents unit_tests from leaking it.
   StatsTable::set_current(NULL);
   delete table;
 
   return 0;
 }