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

Unified Diff: content/test/content_test_suite.cc

Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to lastest crrev.com/1128113011 Created 5 years, 5 months 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
« no previous file with comments | « content/test/BUILD.gn ('k') | content/test/test_native_pixmap_manager_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/content_test_suite.cc
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index 7430cd8b0e5a4d3b0b66ef64cd179cc81002cf95..c61b9be89473ce3af4d78856408348ebd587a269 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -36,7 +36,7 @@
#endif
#if defined(USE_OZONE)
-#include "ui/ozone/public/native_pixmap_manager.h"
+#include "content/test/test_native_pixmap_manager_ozone.h"
#endif
namespace content {
@@ -113,7 +113,8 @@ void ContentTestSuite::Initialize() {
#if defined(USE_OZONE)
if (!is_child_process) {
DCHECK(!ui::NativePixmapManager::GetInstance());
- ui::NativePixmapManager::SetInstance(ui::NativePixmapManager::Create());
+ ui::NativePixmapManager::SetInstance(
+ TestNativePixmapManager::GetInstance());
}
#endif
}
« no previous file with comments | « content/test/BUILD.gn ('k') | content/test/test_native_pixmap_manager_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698