Remove logic for lazy initialization of WebKit.

content/shell/renderer/layout_test/layout_test_render_process_observer.cc

 // Copyright (c) 2014 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.
 
 #include "content/shell/renderer/layout_test/layout_test_render_process_observer.h"
 
 #include "base/command_line.h"
 #include "components/test_runner/event_sender.h"
 #include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/web_test_interfaces.h"
@@ skipping 25 matching lines @@
   return g_instance;
 }
 
 LayoutTestRenderProcessObserver::LayoutTestRenderProcessObserver()
     : main_test_runner_(NULL),
       test_delegate_(NULL) {
   CHECK(!g_instance);
   g_instance = this;
   RenderThread::Get()->AddObserver(this);
   EnableRendererLayoutTestMode();
-}
 
-LayoutTestRenderProcessObserver::~LayoutTestRenderProcessObserver() {
-  CHECK(g_instance == this);
-  g_instance = NULL;
-}
-
-void LayoutTestRenderProcessObserver::SetTestDelegate(
-    test_runner::WebTestDelegate* delegate) {
-  test_interfaces_->SetDelegate(delegate);
-  test_delegate_ = delegate;
-}
-
-void LayoutTestRenderProcessObserver::SetMainWindow(RenderView* view) {
-  BlinkTestRunner* test_runner = BlinkTestRunner::Get(view);
-  test_interfaces_->SetWebView(view->GetWebView(), test_runner->proxy());
-  main_test_runner_ = test_runner;
-}
-
-void LayoutTestRenderProcessObserver::WebKitInitialized() {
   // We always expose GC to layout tests.
   std::string flags("--expose-gc");
   v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
 
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kStableReleaseMode)) {
     WebRuntimeFeatures::enableTestOnlyFeatures(true);
   }
 
   test_interfaces_.reset(new test_runner::WebTestInterfaces);
   test_interfaces_->ResetAll();
   test_interfaces_->SetSendWheelGestures(UseGestureBasedWheelScrolling());
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableFontAntialiasing)) {
     blink::setFontAntialiasingEnabledForTest(true);
   }
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAlwaysUseComplexText)) {
     blink::setAlwaysUseComplexTextForTest(true);
   }
 }
 
+LayoutTestRenderProcessObserver::~LayoutTestRenderProcessObserver() {
+  CHECK(g_instance == this);
+  g_instance = NULL;
+}
+
+void LayoutTestRenderProcessObserver::SetTestDelegate(
+    test_runner::WebTestDelegate* delegate) {
+  test_interfaces_->SetDelegate(delegate);
+  test_delegate_ = delegate;
+}
+
+void LayoutTestRenderProcessObserver::SetMainWindow(RenderView* view) {
+  BlinkTestRunner* test_runner = BlinkTestRunner::Get(view);
+  test_interfaces_->SetWebView(view->GetWebView(), test_runner->proxy());
+  main_test_runner_ = test_runner;
+}
+
 void LayoutTestRenderProcessObserver::OnRenderProcessShutdown() {
   test_interfaces_.reset();
 }
 
 bool LayoutTestRenderProcessObserver::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(LayoutTestRenderProcessObserver, message)
     IPC_MESSAGE_HANDLER(ShellViewMsg_SetWebKitSourceDir, OnSetWebKitSourceDir)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void LayoutTestRenderProcessObserver::OnSetWebKitSourceDir(
     const base::FilePath& webkit_source_dir) {
   webkit_source_dir_ = webkit_source_dir;
 }
 
 }  // namespace content