| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index ba49266605de5233a33079313cb131afb9178af6..3d98b5a8f0870286f52953175599cd482e73809d 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -2658,6 +2658,8 @@ TEST_F(RenderViewImplBlinkSettingsTest, Negative) {
|
| EXPECT_TRUE(settings()->viewportEnabled());
|
| }
|
|
|
| +#if !defined(OS_CHROMEOS)
|
| +// UseZoomForDSF is enabled on ChromeOS.
|
| TEST_F(RenderViewImplScaleFactorTest, ConverViewportToWindowWithoutZoomForDSF) {
|
| DoSetUp();
|
| SetDeviceScaleFactor(2.f);
|
| @@ -2668,6 +2670,7 @@ TEST_F(RenderViewImplScaleFactorTest, ConverViewportToWindowWithoutZoomForDSF) {
|
| EXPECT_EQ(200, rect.width);
|
| EXPECT_EQ(100, rect.height);
|
| }
|
| +#endif
|
|
|
| TEST_F(RenderViewImplScaleFactorTest, ConverViewportToWindowWithZoomForDSF) {
|
| base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
|
|