Revert of services/ui: Have an explicit lifetime/ownership of ui::GpuService.

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 625 matching lines @@
   blink::WebView::setUseExternalPopupMenus(true);
 #endif
 
   lazy_tls.Pointer()->Set(this);
 
   // Register this object as the main thread.
   ChildProcess::current()->set_main_thread(this);
 
 #if defined(MOJO_SHELL_CLIENT)
   if (IsRunningInMash())
-    gpu_service_ =
-        ui::GpuService::Initialize(GetMojoShellConnection()->GetConnector());
+    ui::GpuService::Initialize(GetMojoShellConnection()->GetConnector());
 #endif
 
   InitializeWebKit(resource_task_queue);
 
   // In single process the single process is all there is.
   webkit_shared_timer_suspended_ = false;
   widget_count_ = 0;
   hidden_widget_count_ = 0;
   idle_notification_delay_in_ms_ = kInitialIdleHandlerDelayMs;
   idle_notifications_to_skip_ = 0;
@@ skipping 1139 matching lines @@
     // Cache some variables that are needed on the compositor thread for our
     // implementation of GpuChannelHostFactory.
     io_thread_task_runner_ = ChildProcess::current()->io_task_runner();
 
     gpu_channel_ =
         gpu::GpuChannelHost::Create(this, client_id, gpu_info, channel_handle,
                                     ChildProcess::current()->GetShutDownEvent(),
                                     gpu_memory_buffer_manager());
   } else {
 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
-    gpu_channel_ = gpu_service_->EstablishGpuChannelSync();
+    gpu_channel_ = ui::GpuService::GetInstance()->EstablishGpuChannelSync();
 #else
     NOTREACHED();
 #endif
   }
   return gpu_channel_;
 }
 
 std::unique_ptr<cc::OutputSurface>
 RenderThreadImpl::CreateCompositorOutputSurface(
     bool use_software,
@@ skipping 422 matching lines @@
       v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical)
     v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate;
 
   blink::mainThreadIsolate()->MemoryPressureNotification(
       v8_memory_pressure_level);
   blink::MemoryPressureNotificationToWorkerThreadIsolates(
       v8_memory_pressure_level);
 }
 
 }  // namespace content