Revert of Aura on Android: content/browser

content/browser/android/content_video_view.cc

Index: content/browser/android/content_video_view.cc
diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc
index 14ba5d45336dd3d4552cc62185fe4862e2a97a6b..4b14959ba5f97860f4769bae44f2393645d77d27 100644
--- a/content/browser/android/content_video_view.cc
+++ b/content/browser/android/content_video_view.cc
@@ -7,15 +7,12 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
+#include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "jni/ContentVideoView_jni.h"
 
-#if !defined(USE_AURA)
-#include "content/browser/android/content_view_core_impl.h"
-#endif
-
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ScopedJavaGlobalRef;
@@ -162,12 +159,8 @@ void ContentVideoView::RecordExitFullscreenPlayback(
 JavaObjectWeakGlobalRef ContentVideoView::CreateJavaObject(
     ContentViewCore* content_view_core) {
   JNIEnv* env = AttachCurrentThread();
-  base::android::ScopedJavaLocalRef<jobject> j_content_view_core;
-
-#if !defined(USE_AURA)
-  j_content_view_core = content_view_core->GetJavaObject();
-#endif
-
+  base::android::ScopedJavaLocalRef<jobject> j_content_view_core =
+      content_view_core->GetJavaObject();
   if (j_content_view_core.is_null())
     return JavaObjectWeakGlobalRef(env, nullptr);