Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1607)

Unified Diff: content/child/child_thread_impl_browsertest.cc

Issue 2485623002: discardable_memory: Using mojo IPC to replace Chrome IPC (Closed)
Patch Set: Fix build bots. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/child/child_thread_impl_browsertest.cc
diff --git a/content/child/child_thread_impl_browsertest.cc b/content/child/child_thread_impl_browsertest.cc
deleted file mode 100644
index ab21ddd453db3b28c0b4f633d8fea71ae7c32a29..0000000000000000000000000000000000000000
--- a/content/child/child_thread_impl_browsertest.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2015 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/child/child_thread_impl.h"
-
-#include <stddef.h>
-#include <string.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 "components/discardable_memory/client/client_discardable_shared_memory_manager.h"
-#include "components/discardable_memory/service/discardable_shared_memory_manager.h"
-#include "content/child/child_gpu_memory_buffer_manager.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 {
-
-class ChildThreadImplBrowserTest : public ContentBrowserTest {
- public:
- ChildThreadImplBrowserTest()
- : 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(&ChildThreadImplBrowserTest::SetUpOnChildThread,
- base::Unretained(this)));
- }
-
- discardable_memory::ClientDiscardableSharedMemoryManager*
- child_discardable_shared_memory_manager() {
- return child_discardable_shared_memory_manager_;
- }
-
- private:
- void SetUpOnChildThread() {
- child_discardable_shared_memory_manager_ =
- ChildThreadImpl::current()->discardable_shared_memory_manager();
- }
-
- discardable_memory::ClientDiscardableSharedMemoryManager*
- child_discardable_shared_memory_manager_;
-};
-
-IN_PROC_BROWSER_TEST_F(ChildThreadImplBrowserTest, 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::current()->SetMemoryLimit(
- 0);
-
- // Should fail as memory should have been purged.
- EXPECT_FALSE(memory->Lock());
-}
-
-IN_PROC_BROWSER_TEST_F(ChildThreadImplBrowserTest,
- 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(ChildThreadImplBrowserTest,
- 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::current()
- ->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::current()
- ->GetBytesAllocated())
- break;
- }
-
- EXPECT_LT(base::TimeTicks::Now(), end);
-}
-
-} // namespace
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698