[Chromecast] Handle device scale factor correctly

chromecast/browser/cast_content_browser_client.cc

Index: chromecast/browser/cast_content_browser_client.cc
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
index 39ffe59e106972dfaeda5bba64eb4660ccaef65a..fafc3729aa7a62b016b18bf8feb773cf67078400 100644
--- a/chromecast/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -276,13 +276,18 @@ void CastContentBrowserClient::OverrideWebkitPrefs(
   // Enable 5% margins for WebVTT cues to keep within title-safe area
   prefs->text_track_margin_percentage = 5;
 
-#if defined(OS_ANDROID)
+#if !defined(OS_ANDROID)

[alokp, 2016/05/11 21:48:47]

You might want to just set viewport_enabled and viewport_meta_enabled to true
without any OS_ANDROID guard and remove those DCHECKs.

+  // Viewport is only enabled by default on Android; we use it consistently
+  // across all platforms.
+  prefs->viewport_enabled = true;
+  prefs->viewport_meta_enabled = true;
+#endif
+
   // Enable the television style for viewport so that all cast apps have a
   // 1280px wide layout viewport by default.
   DCHECK(prefs->viewport_enabled);
   DCHECK(prefs->viewport_meta_enabled);
   prefs->viewport_style = content::ViewportStyle::TELEVISION;
-#endif  // defined(OS_ANDROID)
 }
 
 void CastContentBrowserClient::ResourceDispatcherHostCreated() {