mus+ash: Enable Chrome HW rendering in mus+ash

services/ui/common/gpu_service.cc

 // Copyright 2016 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 "services/ui/common/gpu_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
@@ skipping 71 matching lines @@
   return g_gpu_service;
 }
 
 void GpuService::EstablishGpuChannel(const base::Closure& callback) {
   base::AutoLock auto_lock(lock_);
   auto runner = base::ThreadTaskRunnerHandle::Get();
   if (GetGpuChannelLocked()) {
     runner->PostTask(FROM_HERE, callback);
     return;
   }
-
-  base::Closure wrapper_callback =
-      IsMainThread() ? callback
-                     : base::Bind(PostTask, runner, FROM_HERE, callback);
-  establish_callbacks_.push_back(wrapper_callback);
-
+  establish_callbacks_.push_back(
+      base::Bind(PostTask, runner, FROM_HERE, callback));
   if (!is_establishing_) {
     is_establishing_ = true;
     main_task_runner_->PostTask(
         FROM_HERE, base::Bind(&GpuService::EstablishGpuChannelOnMainThread,
                               base::Unretained(this)));
   }
 }
 
 scoped_refptr<gpu::GpuChannelHost> GpuService::EstablishGpuChannelSync() {
   base::AutoLock auto_lock(lock_);
@@ skipping 104 matching lines @@
   }
 
   auto auto_lock = base::WrapUnique<base::AutoLock>(
       locked ? nullptr : new base::AutoLock(lock_));
   DCHECK(is_establishing_);
   DCHECK(!gpu_channel_);
 
   is_establishing_ = false;
   gpu_channel_ = gpu_channel;
   establishing_condition_.Broadcast();
+  gpu_service_.reset();
 
   for (const auto& i : establish_callbacks_)
     i.Run();
   establish_callbacks_.clear();
-  gpu_service_.reset();
 }
 
 bool GpuService::IsMainThread() {
   return main_task_runner_->BelongsToCurrentThread();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 GpuService::GetIOThreadTaskRunner() {
   return io_thread_.task_runner();
 }
@@ skipping 11 matching lines @@
   MojoResult result = mojo::UnwrapSharedMemoryHandle(
       std::move(handle), &platform_handle, &shared_memory_size, &readonly);
   if (result != MOJO_RESULT_OK)
     return nullptr;
   DCHECK_EQ(shared_memory_size, size);
 
   return base::MakeUnique<base::SharedMemory>(platform_handle, readonly);
 }
 
 }  // namespace ui