Chrome side to implement WebMimeRegistry.

R=dglazkov

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

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

1 files changed, 4 insertions, 8 deletions

diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 795b17b..d042226 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -25,7 +25,6 @@
 #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"
@@ -33,6 +32,7 @@
 #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/tools/test_shell/test_shell_webkit_init.h"
 
 #include "WebKit.h"
 
@@ -88,17 +88,13 @@ int main(int argc, char* argv[]) {
                          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);
+  // Initialize WebKit for this scope.
+  TestShellWebKitInit test_shell_webkit_init(layout_test_mode);
 
   // Suppress abort message in v8 library in debugging mode.
   // V8 calls abort() when it hits assertion errors.
-  if (suppress_error_dialogs) {
+  if (suppress_error_dialogs)
     platform.SuppressErrorReporting();
-  }
 
   if (parsed_command_line.HasSwitch(test_shell::kEnableTracing))
     base::TraceLog::StartTracing();