NOT FOR REVIEW: Aura on Android

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 7979b644e0d59d19910c792f4928ad66f59f8d3f..265fbe115d76026f6b082e845e4ab4516a206ed1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -117,7 +117,7 @@
 #include "content/browser/media/media_web_contents_observer.h"
 #endif
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) &&!defined(USE_AURA)
 #include "content/browser/android/content_video_view.h"
 #include "content/browser/android/date_time_chooser_android.h"
 #include "content/browser/android/media_players_observer.h"
@@ -412,7 +412,7 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context)
   media_web_contents_observer_.reset(new MediaWebContentsObserver(this));
 #endif
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   audio_state_provider_.reset(new MediaPlayersObserver(this));

[no sievers, 2015/10/20 19:24:22]

use the android one

 #else
   audio_state_provider_.reset(new AudioStreamMonitor(this));
@@ -660,7 +660,7 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
                         OnHideValidationMessage)
     IPC_MESSAGE_HANDLER(ViewHostMsg_MoveValidationMessage,
                         OnMoveValidationMessage)
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
     IPC_MESSAGE_HANDLER(ViewHostMsg_FindMatchRects_Reply,
                         OnFindMatchRectsReply)
     IPC_MESSAGE_HANDLER(ViewHostMsg_OpenDateTimeDialog,
@@ -1389,7 +1389,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
 
   manifest_manager_host_.reset(new ManifestManagerHost(this));
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   date_time_chooser_.reset(new DateTimeChooserAndroid());
 #endif
 
@@ -1596,7 +1596,7 @@ void WebContentsImpl::ExitFullscreenMode() {
   if (widget_view)
     RenderWidgetHostImpl::From(widget_view->GetRenderWidgetHost())->Shutdown();
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)

[no sievers, 2015/10/20 19:24:22]

TODO: fullscreen video bug

   ContentVideoView* video_view = ContentVideoView::GetInstance();
   if (video_view != NULL)
     video_view->OnExitFullscreen();
@@ -3169,7 +3169,7 @@ void WebContentsImpl::OnFindReply(int request_id,
   }
 }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 void WebContentsImpl::OnFindMatchRectsReply(
     int version,
     const std::vector<gfx::RectF>& rects,
@@ -3334,8 +3334,8 @@ void WebContentsImpl::CreateVideoPowerSaveBlocker() {
   video_power_save_blocker_ = PowerSaveBlocker::Create(
       PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
       PowerSaveBlocker::kReasonVideoPlayback, "Playing video");
-#if defined(OS_ANDROID)
-  static_cast<PowerSaveBlockerImpl*>(video_power_save_blocker_.get())
+#if defined(OS_ANDROID) &&!defined(USE_AURA)
+static_cast<PowerSaveBlockerImpl*>(video_power_save_blocker_.get())
       ->InitDisplaySleepBlocker(this);
 #endif
 }
@@ -3392,7 +3392,7 @@ void WebContentsImpl::OnMediaPausedNotification(int64 player_cookie) {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_, MediaPaused());
 }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 
 void WebContentsImpl::OnMediaSessionStateChanged() {
   MediaSession* session = MediaSession::Get(this);
@@ -4416,7 +4416,7 @@ bool WebContentsImpl::CreateRenderFrameForRenderManager(
   return true;
 }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 
 base::android::ScopedJavaLocalRef<jobject>
 WebContentsImpl::GetJavaWebContents() {