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

ui/views/mus/window_manager_connection.cc

 // Copyright 2015 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 "ui/views/mus/window_manager_connection.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
@@ skipping 23 matching lines @@
 base::LazyInstance<WindowManagerConnectionPtr>::Leaky lazy_tls_ptr =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 WindowManagerConnection::~WindowManagerConnection() {
   // ~WindowTreeClient calls back to us (we're its delegate), destroy it while
   // we are still valid.
   client_.reset();
   ui::Clipboard::DestroyClipboardForCurrentThread();
-  gpu_service_.reset();
+  ui::GpuService::Terminate();
   lazy_tls_ptr.Pointer()->Set(nullptr);
 
   if (ViewsDelegate::GetInstance()) {
     ViewsDelegate::GetInstance()->set_native_widget_factory(
         ViewsDelegate::NativeWidgetFactory());
   }
 }
 
 // static
 std::unique_ptr<WindowManagerConnection> WindowManagerConnection::Create(
@@ skipping 88 matching lines @@
 const std::set<ui::Window*>& WindowManagerConnection::GetRoots() const {
   return client_->GetRoots();
 }
 
 WindowManagerConnection::WindowManagerConnection(
     shell::Connector* connector,
     const shell::Identity& identity)
     : connector_(connector), identity_(identity) {
   lazy_tls_ptr.Pointer()->Set(this);
 
-  gpu_service_ = ui::GpuService::Initialize(connector);
+  ui::GpuService::Initialize(connector);
+
   client_.reset(new ui::WindowTreeClient(this, nullptr, nullptr));
   client_->ConnectViaWindowTreeFactory(connector_);
 
   screen_.reset(new ScreenMus(this));
   screen_->Init(connector);
 
   std::unique_ptr<ClipboardMus> clipboard(new ClipboardMus);
   clipboard->Init(connector);
   ui::Clipboard::SetClipboardForCurrentThread(std::move(clipboard));
 
@@ skipping 66 matching lines @@
 void WindowManagerConnection::OnWindowManagerFrameValuesChanged() {
   if (client_)
     NativeWidgetMus::NotifyFrameChanged(client_.get());
 }
 
 gfx::Point WindowManagerConnection::GetCursorScreenPoint() {
   return client_->GetCursorScreenPoint();
 }
 
 }  // namespace views