Remove discardable_memory::DSMM::{Create,Get}Instance()

services/ui/service.cc

 // Copyright 2014 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/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 181 matching lines @@
   window_server_.reset(new ws::WindowServer(this));
 
   // DeviceDataManager must be initialized before TouchController. On non-Linux
   // platforms there is no DeviceDataManager so don't create touch controller.
   if (ui::DeviceDataManager::HasInstance())
     touch_controller_.reset(
         new ws::TouchController(window_server_->display_manager()));
 
   ime_server_.Init(context()->connector(), test_config_);
 
-  discardable_memory::DiscardableSharedMemoryManager::CreateInstance();
+  discardable_shared_memory_manager_ =
+      base::MakeUnique<discardable_memory::DiscardableSharedMemoryManager>();
 }
 
 bool Service::OnConnect(const service_manager::ServiceInfo& remote_info,
                         service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::AccessibilityManager>(this);
   registry->AddInterface<mojom::Clipboard>(this);
   registry->AddInterface<mojom::DisplayManager>(this);
   registry->AddInterface<mojom::Gpu>(this);
   registry->AddInterface<mojom::IMERegistrar>(this);
   registry->AddInterface<mojom::IMEServer>(this);
@@ skipping 148 matching lines @@
   if (!user_state->window_tree_host_factory) {
     user_state->window_tree_host_factory.reset(new ws::WindowTreeHostFactory(
         window_server_.get(), remote_identity.user_id()));
   }
   user_state->window_tree_host_factory->AddBinding(std::move(request));
 }
 
 void Service::Create(
     const service_manager::Identity& remote_identity,
     discardable_memory::mojom::DiscardableSharedMemoryManagerRequest request) {
-  discardable_memory::DiscardableSharedMemoryManager::GetInstance()->Bind(
-      std::move(request));
+  discardable_shared_memory_manager_->Bind(std::move(request));
 }
 
 void Service::Create(const service_manager::Identity& remote_identity,
                      mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
       std::move(request));
 }
 
 
 }  // namespace ui