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

services/ui/service.cc

Index: services/ui/service.cc
diff --git a/services/ui/service.cc b/services/ui/service.cc
index 66490be2d8d3f32bc556db02a27327ed42c17a6f..5318d0b20cff1a2cfd69a75d28aeb0df50666230 100644
--- a/services/ui/service.cc
+++ b/services/ui/service.cc
@@ -13,7 +13,6 @@
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
-#include "components/discardable_memory/service/discardable_shared_memory_manager.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/catalog/public/cpp/resource_loader.h"
 #include "services/catalog/public/interfaces/constants.mojom.h"
@@ -198,8 +197,6 @@ void Service::OnStart() {
         new ws::TouchController(window_server_->display_manager()));
 
   ime_server_.Init(context()->connector(), test_config_);
-
-  discardable_memory::DiscardableSharedMemoryManager::CreateInstance();
 }
 
 bool Service::OnConnect(const service_manager::ServiceInfo& remote_info,
@@ -368,8 +365,7 @@ void Service::Create(const service_manager::Identity& remote_identity,
 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,