Revert of discardable_memory: Using mojo IPC to replace Chrome IPC

content/renderer/render_thread_impl_browsertest.cc

Index: content/renderer/render_thread_impl_browsertest.cc
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc
index 53a92f7c19f64d9eb2e543c3e5b4fdaf9e8132ca..cdc43bd6c3a2a9d43041d3361850b049fc8b9e35 100644
--- a/content/renderer/render_thread_impl_browsertest.cc
+++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -18,8 +18,6 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/output/buffer_to_texture_target_map.h"
-#include "components/discardable_memory/client/client_discardable_shared_memory_manager.h"
-#include "components/discardable_memory/service/discardable_shared_memory_manager.h"
 #include "content/app/mojo/mojo_init.h"
 #include "content/child/child_gpu_memory_buffer_manager.h"
 #include "content/common/in_process_child_thread_params.h"
@@ -388,105 +386,5 @@
                                          gfx::BufferFormat::BGRA_8888,
                                          gfx::BufferFormat::YVU_420)));
 
-class RenderThreadImplDiscardableMemoryBrowserTest : public ContentBrowserTest {
- public:
-  RenderThreadImplDiscardableMemoryBrowserTest()
-      : child_discardable_shared_memory_manager_(nullptr) {}
-
-  // Overridden from BrowserTestBase:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitch(switches::kSingleProcess);
-  }
-  void SetUpOnMainThread() override {
-    NavigateToURL(shell(), GURL(url::kAboutBlankURL));
-    PostTaskToInProcessRendererAndWait(base::Bind(
-        &RenderThreadImplDiscardableMemoryBrowserTest::SetUpOnRenderThread,
-        base::Unretained(this)));
-  }
-
-  discardable_memory::ClientDiscardableSharedMemoryManager*
-  child_discardable_shared_memory_manager() {
-    return child_discardable_shared_memory_manager_;
-  }
-
- private:
-  void SetUpOnRenderThread() {
-    child_discardable_shared_memory_manager_ =
-        RenderThreadImpl::current()->GetDiscardableSharedMemoryManagerForTest();
-  }
-
-  discardable_memory::ClientDiscardableSharedMemoryManager*
-      child_discardable_shared_memory_manager_;
-};
-
-IN_PROC_BROWSER_TEST_F(RenderThreadImplDiscardableMemoryBrowserTest,
-                       LockDiscardableMemory) {
-  const size_t kSize = 1024 * 1024;  // 1MiB.
-
-  std::unique_ptr<base::DiscardableMemory> memory =
-      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()
-      ->SetMemoryLimit(0);
-
-  // Should fail as memory should have been purged.
-  EXPECT_FALSE(memory->Lock());
-}
-
-IN_PROC_BROWSER_TEST_F(RenderThreadImplDiscardableMemoryBrowserTest,
-                       DiscardableMemoryAddressSpace) {
-  const size_t kLargeSize = 4 * 1024 * 1024;   // 4MiB.
-  const size_t kNumberOfInstances = 1024 + 1;  // >4GiB total.
-
-  ScopedVector<base::DiscardableMemory> instances;
-  for (size_t i = 0; i < kNumberOfInstances; ++i) {
-    std::unique_ptr<base::DiscardableMemory> memory =
-        child_discardable_shared_memory_manager()
-            ->AllocateLockedDiscardableMemory(kLargeSize);
-    ASSERT_TRUE(memory);
-    void* addr = memory->data();
-    ASSERT_NE(nullptr, addr);
-    memory->Unlock();
-    instances.push_back(std::move(memory));
-  }
-}
-
-IN_PROC_BROWSER_TEST_F(RenderThreadImplDiscardableMemoryBrowserTest,
-                       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()
-                ->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()
-             ->GetBytesAllocated())
-      break;
-  }
-
-  EXPECT_LT(base::TimeTicks::Now(), end);
-}
-
 }  // namespace
 }  // namespace content