Revert of Aura on Android: content/browser

content/browser/android/child_process_launcher_android.cc

 // Copyright (c) 2012 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/android/child_process_launcher_android.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 23 matching lines @@
 
 namespace {
 
 // Pass a java surface object to the MediaPlayerAndroid object
 // identified by render process handle, render frame ID and player ID.
 static void SetSurfacePeer(
     const base::android::JavaRef<jobject>& surface,
     base::ProcessHandle render_process_handle,
     int render_frame_id,
     int player_id) {
-#if !defined(USE_AURA)
   int render_process_id = 0;
   RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
   while (!it.IsAtEnd()) {
     if (it.GetCurrentValue()->GetHandle() == render_process_handle) {
       render_process_id = it.GetCurrentValue()->GetID();
       break;
     }
     it.Advance();
   }
   if (!render_process_id) {
@@ skipping 21 matching lines @@
   media::MediaPlayerAndroid* player = player_manager->GetPlayer(player_id);
   if (!player) {
     DVLOG(1) << "Cannot find media player for player_id " << player_id;
     return;
   }
 
   if (player != player_manager->GetFullscreenPlayer()) {
     gfx::ScopedJavaSurface scoped_surface(surface);
     player->SetVideoSurface(std::move(scoped_surface));
   }
-#else
-  NOTREACHED();
-#endif
 }
 
 }  // anonymous namespace
 
 // Called from ChildProcessLauncher.java when the ChildProcess was
 // started.
 // |client_context| is the pointer to StartChildProcessCallback which was
 // passed in from StartChildProcess.
 // |handle| is the processID of the child process as originated in Java, 0 if
 // the ChildProcess could not be created.
@@ skipping 137 matching lines @@
 jboolean IsSingleProcess(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess);
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content