NOT FOR REVIEW: Aura on Android

content/browser/media/media_web_contents_observer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/media_web_contents_observer.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "content/browser/media/cdm/browser_cdm_manager.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
@@ skipping 15 matching lines @@
     WebContents* web_contents)
     : WebContentsObserver(web_contents)
 {
 }
 
 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
   media_player_managers_.erase(key);
 
   MediaPlayersObserver* audio_observer = GetMediaPlayersObserver();
   if (audio_observer)
     audio_observer->RenderFrameDeleted(render_frame_host);
 #endif
   // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
   // and BrowserCdmManager all run on browser UI thread. So this call is okay.
   // In the future we need to support the case where MediaWebContentsObserver
   // get notified on browser UI thread, but BrowserMediaPlayerManager and
   // BrowserCdmManager run on a different thread.
   BrowserCdmManager* browser_cdm_manager =
       BrowserCdmManager::FromProcess(render_frame_host->GetProcess()->GetID());
   if (browser_cdm_manager)
     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,
     RenderFrameHost* render_frame_host) {
   if (OnMediaPlayerMessageReceived(msg, render_frame_host))
     return true;
 
   if (OnMediaPlayerSetCdmMessageReceived(msg, render_frame_host))
     return true;
 
@@ skipping 121 matching lines @@
       iter != media_player_managers_.end(); ++iter) {
     BrowserMediaPlayerManager* manager = iter->second;
     manager->OnFrameInfoUpdated();
   }
 }
 #endif  // defined(VIDEO_HOLE)
 
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content