Enable use-zoom-for-dsf on chromeos devices

content/common/content_switches_internal.cc

Index: content/common/content_switches_internal.cc
diff --git a/content/common/content_switches_internal.cc b/content/common/content_switches_internal.cc
index 27f63c253c35b53d07a0cdd7436a197e815b923f..07386cdf938dfce3b86063423fa896a309935dd2 100644
--- a/content/common/content_switches_internal.cc
+++ b/content/common/content_switches_internal.cc
@@ -16,6 +16,10 @@
 #include "ui/gfx/win/direct_write.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "base/sys_info.h"
+#endif
+
 namespace content {
 
 namespace {
@@ -24,6 +28,16 @@ namespace {
 static bool g_win32k_renderer_lockdown_disabled = false;
 #endif
 
+bool IsUseZoomForDSFEnabledByDefault() {
+#if defined(OS_CHROMEOS)
+  // TODO(oshima): Device emulation needs to be fixed to pass
+  // all tests on bots. crbug.com/584709.
+  return base::SysInfo::IsRunningOnChromeOS();
+#else
+  return false;
+#endif
+}
+
 }  // namespace
 
 bool IsPinchToZoomEnabled() {
@@ -84,10 +98,14 @@ V8CacheOptions GetV8CacheOptions() {
 }
 
 bool IsUseZoomForDSFEnabled() {
+  static bool use_zoom_for_dsf_enabled_by_default =
+      IsUseZoomForDSFEnabledByDefault();
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  bool enabled = command_line->HasSwitch(switches::kEnableUseZoomForDSF) &&
-                 command_line->GetSwitchValueASCII(
-                     switches::kEnableUseZoomForDSF) != "false";
+  bool enabled =
+      (command_line->HasSwitch(switches::kEnableUseZoomForDSF) ||
+       use_zoom_for_dsf_enabled_by_default) &&
+      command_line->GetSwitchValueASCII(
+          switches::kEnableUseZoomForDSF) != "false";
 
   return enabled;
 }