NOT FOR REVIEW: Aura on Android

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index dd9bab868ac8c7921370b381c6b292f95a86996b..3b50b346344c4355319451ed59399f15690bc259 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -217,7 +217,7 @@ ContentViewCoreImpl::ContentViewCoreImpl(
       root_layer_(cc::SolidColorLayer::Create(Compositor::LayerSettings())),
       page_scale_(1),
       view_android_(new ui::ViewAndroid(view_android_delegate, window_android)),
-      dpi_scale_(ui::GetScaleFactorForNativeView(view_android_.get())),
+      dpi_scale_(1),
       window_android_(window_android),
       device_orientation_(0),
       accessibility_enabled_(false) {
@@ -1324,9 +1324,11 @@ void ContentViewCoreImpl::SetAccessibilityEnabledInternal(bool enabled) {
 }
 
 void ContentViewCoreImpl::SendOrientationChangeEventInternal() {
+#if !defined(USE_AURA)
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (rwhv)
     rwhv->UpdateScreenInfo(GetViewAndroid());
+#endif
 
   static_cast<WebContentsImpl*>(web_contents())->
       screen_orientation_dispatcher_host()->OnOrientationChange();