| Index: ui/compositor/test/test_suite.cc
|
| diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc
|
| index d98f52da63f85aa9866085db991bbecc3e4106dc..569fc8eb4b54e435f74b130a427e33a7847cf15d 100644
|
| --- a/ui/compositor/test/test_suite.cc
|
| +++ b/ui/compositor/test/test_suite.cc
|
| @@ -8,12 +8,10 @@
|
| #include "base/message_loop/message_loop.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/compositor/compositor_switches.h"
|
| +#include "ui/gfx/dpi.h"
|
| #include "ui/gfx/gfx_paths.h"
|
| #include "ui/gl/gl_surface.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "ui/gfx/win/dpi.h"
|
| -#endif
|
|
|
| namespace ui {
|
| namespace test {
|
| @@ -29,7 +27,7 @@ void CompositorTestSuite::Initialize() {
|
|
|
| gfx::RegisterPathProvider();
|
|
|
| -#if defined(OS_WIN)
|
| +#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
| gfx::InitDeviceScaleFactor(1.0f);
|
| #endif
|
|
|
|
|