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

content/renderer/render_thread_impl_discardable_memory_browsertest.cc

 // Copyright 2013 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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/discardable_memory/client/client_discardable_shared_memory_manager.h"
 #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
+#include "content/browser/browser_main_loop.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "gpu/ipc/client/gpu_memory_buffer_impl.h"
 #include "ui/gfx/buffer_format_util.h"
 #include "url/gurl.h"
 
 namespace content {
 namespace {
@@ skipping 38 matching lines @@
       child_discardable_shared_memory_manager()
           ->AllocateLockedDiscardableMemory(kSize);
 
   ASSERT_TRUE(memory);
   void* addr = memory->data();
   ASSERT_NE(nullptr, addr);
 
   memory->Unlock();
 
   // Purge all unlocked memory.
-  discardable_memory::DiscardableSharedMemoryManager::GetInstance()
+  BrowserMainLoop::GetInstance()
+      ->discardable_shared_memory_manager()
       ->SetMemoryLimit(0);
 
   // Should fail as memory should have been purged.
   EXPECT_FALSE(memory->Lock());
 }
 
 // Disable the test for the Android asan build.
 // See http://crbug.com/667837 for detail.
 #if !(defined(OS_ANDROID) && defined(ADDRESS_SANITIZER))
 IN_PROC_BROWSER_TEST_F(RenderThreadImplDiscardableMemoryBrowserTest,
@@ skipping 19 matching lines @@
                        ReleaseFreeDiscardableMemory) {
   const size_t kSize = 1024 * 1024;  // 1MiB.
 
   std::unique_ptr<base::DiscardableMemory> memory =
       child_discardable_shared_memory_manager()
           ->AllocateLockedDiscardableMemory(kSize);
 
   EXPECT_TRUE(memory);
   memory.reset();
 
-  EXPECT_GE(discardable_memory::DiscardableSharedMemoryManager::GetInstance()
+  EXPECT_GE(BrowserMainLoop::GetInstance()
+                ->discardable_shared_memory_manager()
                 ->GetBytesAllocated(),
             kSize);
 
   child_discardable_shared_memory_manager()->ReleaseFreeMemory();
 
   // Busy wait for host memory usage to be reduced.
   base::TimeTicks end =
       base::TimeTicks::Now() + base::TimeDelta::FromSeconds(5);
   while (base::TimeTicks::Now() < end) {
-    if (!discardable_memory::DiscardableSharedMemoryManager::GetInstance()
+    if (!BrowserMainLoop::GetInstance()
+             ->discardable_shared_memory_manager()
              ->GetBytesAllocated())
       break;
   }
 
   EXPECT_LT(base::TimeTicks::Now(), end);
 }
 
 }  // namespace
 }  // namespace content