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

services/ui/service.h

Index: services/ui/service.h
diff --git a/services/ui/service.h b/services/ui/service.h
index 7ae9c760f88ef61892d46a2eb325f98a5b9b3884..9aba63949517828d1636f3d5adb31444ad11d324 100644
--- a/services/ui/service.h
+++ b/services/ui/service.h
@@ -14,6 +14,7 @@
 
 #include "base/macros.h"
 #include "components/discardable_memory/public/interfaces/discardable_shared_memory_manager.mojom.h"
+#include "components/discardable_memory/service/discardable_shared_memory_manager.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_runner.h"
@@ -41,6 +42,10 @@
 #include "ui/ozone/public/client_native_pixmap_factory.h"
 #endif
 
+namespace discardable_memory {

[msw, 2016/12/20 16:53:29]

Remove this; the include should suffice.

[Peng, 2016/12/20 18:34:40]

I just found out the discardable memory manager cannot be created in ctro, it
has to be in OnStart(). So I removed the include and change the manager member
to pointer.

+class DiscardableSharedMemoryManager;
+}
+
 namespace display {
 class ScreenManager;
 }
@@ -191,6 +196,9 @@ class Service
   IMERegistrarImpl ime_registrar_;
   IMEServerImpl ime_server_;
 
+  discardable_memory::DiscardableSharedMemoryManager
+      discardable_shared_memory_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(Service);
 };