NOT FOR REVIEW: Aura on Android

content/browser/media/media_web_contents_observer.cc

Index: content/browser/media/media_web_contents_observer.cc
diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc
index b4e41ec12d0a10a89109cd0da8479d54e90610b8..84703a43495c7e89a5e4d9d2fa1729b79922ab4b 100644
--- a/content/browser/media/media_web_contents_observer.cc
+++ b/content/browser/media/media_web_contents_observer.cc
@@ -33,7 +33,7 @@ MediaWebContentsObserver::~MediaWebContentsObserver() {
 
 void MediaWebContentsObserver::RenderFrameDeleted(
     RenderFrameHost* render_frame_host) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);
   // Always destroy the media players before CDMs because we do not support
   // detaching CDMs from media players yet. See http://crbug.com/330324
@@ -54,7 +54,7 @@ void MediaWebContentsObserver::RenderFrameDeleted(
     browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID());
 }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 
 bool MediaWebContentsObserver::OnMessageReceived(
     const IPC::Message& msg,