NOT FOR REVIEW: Aura on Android

content/browser/android/child_process_launcher_android.cc

Index: content/browser/android/child_process_launcher_android.cc
diff --git a/content/browser/android/child_process_launcher_android.cc b/content/browser/android/child_process_launcher_android.cc
index 3b0473a9294ece42c21c18f4cfdcee3122bf8ce8..5f3198dac63f930ade5b00e71a35f03d09158631 100644
--- a/content/browser/android/child_process_launcher_android.cc
+++ b/content/browser/android/child_process_launcher_android.cc
@@ -9,17 +9,21 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
-#include "content/browser/media/android/browser_media_player_manager.h"
-#include "content/browser/media/media_web_contents_observer.h"
-#include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "jni/ChildProcessLauncher_jni.h"
-#include "media/base/android/media_player_android.h"
 #include "ui/gl/android/surface_texture.h"
 
+
+#if !defined(USE_AURA)
+#include "content/browser/media/android/browser_media_player_manager.h"
+#include "content/browser/media/media_web_contents_observer.h"
+#include "content/browser/renderer_host/compositor_impl_android.h"
+#include "media/base/android/media_player_android.h"
+#endif
+
 using base::android::AttachCurrentThread;
 using base::android::ToJavaArrayOfStrings;
 using base::android::ScopedJavaGlobalRef;
@@ -28,6 +32,7 @@ using content::StartChildProcessCallback;
 
 namespace content {
 
+
 namespace {
 
 // Pass a java surface object to the MediaPlayerAndroid object
@@ -52,6 +57,7 @@ static void SetSurfacePeer(
     return;
   }
 
+#if !defined(USE_AURA)
   RenderFrameHostImpl* frame =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
   if (!frame) {
@@ -78,6 +84,7 @@ static void SetSurfacePeer(
     gfx::ScopedJavaSurface scoped_surface(surface);
     player->SetVideoSurface(scoped_surface.Pass());
   }
+#endif
 }
 
 }  // anonymous namespace
@@ -169,6 +176,7 @@ void SetChildProcessInForeground(base::ProcessHandle handle,
       static_cast<jint>(handle), static_cast<jboolean>(in_foreground));
 }
 
+//#if !defined(USE_AURA)
 void EstablishSurfacePeer(
     JNIEnv* env, jclass clazz,
     jint pid, jobject surface, jint primary_id, jint secondary_id) {
@@ -221,6 +229,7 @@ gfx::ScopedJavaSurface GetSurfaceTextureSurface(int surface_texture_id,
       Java_ChildProcessLauncher_getSurfaceTextureSurface(
           env, surface_texture_id, client_id).obj());
 }
+//#endif
 
 jboolean IsSingleProcess(JNIEnv* env, jclass clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(