Revert of gpu: play skp files through the command buffer

gpu/command_buffer/service/in_process_command_buffer.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 "gpu/command_buffer/service/in_process_command_buffer.h"
 
 #include <queue>
 #include <set>
 #include <utility>
 
@@ skipping 203 matching lines @@
     case gfx::SURFACE_TEXTURE_BUFFER:
     case gfx::OZONE_NATIVE_BUFFER:
       *requires_sync_point = true;
       return source_handle;
     default:
       NOTREACHED();
       return gfx::GpuMemoryBufferHandle();
   }
 }
 
-scoped_refptr<InProcessCommandBuffer::Service> GetInitialService(
-    const scoped_refptr<InProcessCommandBuffer::Service>& service) {
-  if (service)
-    return service;
-
-  // Call base::ThreadTaskRunnerHandle::IsSet() to ensure that it is
-  // instantiated before we create the GPU thread, otherwise shutdown order will
-  // delete the ThreadTaskRunnerHandle before the GPU thread's message loop,
-  // and when the message loop is shutdown, it will recreate
-  // ThreadTaskRunnerHandle, which will re-add a new task to the, AtExitManager,
-  // which causes a deadlock because it's already locked.
-  base::ThreadTaskRunnerHandle::IsSet();
-  return g_default_service.Get().gpu_thread;
-}
-
 }  // anonyous namespace
 
 InProcessCommandBuffer::Service::Service() {}
 
 InProcessCommandBuffer::Service::~Service() {}
 
 scoped_refptr<gfx::GLShareGroup>
 InProcessCommandBuffer::Service::share_group() {
   if (!share_group_.get())
     share_group_ = new gfx::GLShareGroup;
@@ skipping 30 matching lines @@
 }
 
 InProcessCommandBuffer::InProcessCommandBuffer(
     const scoped_refptr<Service>& service)
     : context_lost_(false),
       idle_work_pending_(false),
       image_factory_(nullptr),
       last_put_offset_(-1),
       gpu_memory_buffer_manager_(nullptr),
       flush_event_(false, false),
-      service_(GetInitialService(service)),
+      service_(service.get() ? service : g_default_service.Get().gpu_thread),
       gpu_thread_weak_ptr_factory_(this) {
   DCHECK(service_.get());
   next_image_id_.GetNext();
 }
 
 InProcessCommandBuffer::~InProcessCommandBuffer() {
   Destroy();
 }
 
 void InProcessCommandBuffer::OnResizeView(gfx::Size size, float scale_factor) {
@@ skipping 702 matching lines @@
 
 #if defined(OS_ANDROID)
 scoped_refptr<gfx::SurfaceTexture>
 InProcessCommandBuffer::GetSurfaceTexture(uint32 stream_id) {
   DCHECK(stream_texture_manager_);
   return stream_texture_manager_->GetSurfaceTexture(stream_id);
 }
 #endif
 
 }  // namespace gpu