Remove logic for lazy initialization of WebKit.

content/renderer/render_thread_impl_browsertest.cc

 // Copyright 2013 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/renderer/render_thread_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 83 matching lines @@
 };
 
 #if defined(COMPILER_MSVC)
 // See explanation for other RenderViewHostImpl which is the same issue.
 #pragma warning(push)
 #pragma warning(disable: 4250)
 #endif
 
 class RenderThreadImplForTest : public RenderThreadImpl {
  public:
-  RenderThreadImplForTest(const InProcessChildThreadParams& params,
-                          scoped_ptr<scheduler::RendererScheduler> scheduler,
-                          scoped_refptr<TestTaskCounter> test_task_counter)
-      : RenderThreadImpl(params, std::move(scheduler)),
-        test_task_counter_(test_task_counter) {}
+  RenderThreadImplForTest(
+      const InProcessChildThreadParams& params,
+      scoped_ptr<scheduler::RendererScheduler> scheduler,
+      scoped_refptr<base::SingleThreadTaskRunner>& test_task_counter)
+      : RenderThreadImpl(params, std::move(scheduler), test_task_counter) {
+  }
 
   ~RenderThreadImplForTest() override {}
 
-  void SetResourceDispatchTaskQueue(
-      const scoped_refptr<base::SingleThreadTaskRunner>&) override {
-    // Use our TestTaskCounter instead.
-    RenderThreadImpl::SetResourceDispatchTaskQueue(test_task_counter_);
-  }
-
   using ChildThreadImpl::OnMessageReceived;
 
  private:
-  scoped_refptr<TestTaskCounter> test_task_counter_;
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 void QuitTask(base::MessageLoop* message_loop) {
   message_loop->QuitWhenIdle();
 }
 
@@ skipping 46 matching lines @@
          format < static_cast<size_t>(gfx::BufferFormat::LAST) + 1; format++) {
       if (!image_targets.empty())
         image_targets += ",";
       image_targets += base::UintToString(GL_TEXTURE_2D);
     }
     cmd->AppendSwitchASCII(switches::kContentImageTextureTarget, image_targets);
 
     scoped_ptr<scheduler::RendererScheduler> renderer_scheduler =
         scheduler::RendererScheduler::Create();
     InitializeMojo();
+    scoped_refptr<base::SingleThreadTaskRunner> test_task_counter(
+        test_task_counter_.get());
     thread_ = new RenderThreadImplForTest(
         InProcessChildThreadParams(test_helper_->GetChannelId(),
                                    test_helper_->GetIOTaskRunner(),
                                    test_helper_->GetMessagePipeHandle()),
-        std::move(renderer_scheduler), test_task_counter_);
+        std::move(renderer_scheduler), test_task_counter);
     cmd->InitFromArgv(old_argv);
 
-    thread_->EnsureWebKitInitialized();
-
     test_msg_filter_ = make_scoped_refptr(
         new QuitOnTestMsgFilter(test_helper_->GetMessageLoop()));
     thread_->AddFilter(test_msg_filter_.get());
   }
 
   scoped_refptr<TestTaskCounter> test_task_counter_;
   scoped_ptr<ContentClient> content_client_;
   scoped_ptr<ContentBrowserClient> content_browser_client_;
   scoped_ptr<ContentRendererClient> content_renderer_client_;
   scoped_ptr<RenderThreadImplBrowserIPCTestHelper> test_helper_;
@@ skipping 36 matching lines @@
   test_helper_->Sender()->Send(new WebSocketMsg_NotifyFailure(1, ""));
   test_helper_->Sender()->Send(new TestMsg_QuitRunLoop());
 
   test_helper_->GetMessageLoop()->Run();
 
   EXPECT_EQ(0, test_task_counter_->NumTasksPosted());
 }
 
 }  // namespace
 }  // namespace content