| 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
|
| }
|
|
|