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

Side by Side Diff: content/renderer/render_thread_impl_discardable_memory_browsertest.cc

Issue 2514923002: content: Use mus client-lib's gpu-service from renderers. (Closed)
Patch Set: . Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/memory/discardable_memory.h" 13 #include "base/memory/discardable_memory.h"
14 #include "base/memory/scoped_vector.h" 14 #include "base/memory/scoped_vector.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "components/discardable_memory/client/client_discardable_shared_memory_ manager.h" 17 #include "components/discardable_memory/client/client_discardable_shared_memory_ manager.h"
18 #include "components/discardable_memory/service/discardable_shared_memory_manage r.h" 18 #include "components/discardable_memory/service/discardable_shared_memory_manage r.h"
19 #include "content/child/child_gpu_memory_buffer_manager.h"
20 #include "content/public/common/content_switches.h" 19 #include "content/public/common/content_switches.h"
21 #include "content/public/test/content_browser_test.h" 20 #include "content/public/test/content_browser_test.h"
22 #include "content/public/test/content_browser_test_utils.h" 21 #include "content/public/test/content_browser_test_utils.h"
23 #include "content/shell/browser/shell.h" 22 #include "content/shell/browser/shell.h"
24 #include "gpu/ipc/client/gpu_memory_buffer_impl.h" 23 #include "gpu/ipc/client/gpu_memory_buffer_impl.h"
25 #include "ui/gfx/buffer_format_util.h" 24 #include "ui/gfx/buffer_format_util.h"
26 #include "url/gurl.h" 25 #include "url/gurl.h"
27 26
28 namespace content { 27 namespace content {
29 namespace { 28 namespace {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 if (!discardable_memory::DiscardableSharedMemoryManager::GetInstance() 127 if (!discardable_memory::DiscardableSharedMemoryManager::GetInstance()
129 ->GetBytesAllocated()) 128 ->GetBytesAllocated())
130 break; 129 break;
131 } 130 }
132 131
133 EXPECT_LT(base::TimeTicks::Now(), end); 132 EXPECT_LT(base::TimeTicks::Now(), end);
134 } 133 }
135 134
136 } // namespace 135 } // namespace
137 } // namespace content 136 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl_browsertest.cc ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698