Revert of Aura on Android: content/browser

content/browser/android/content_video_view.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/content_video_view.h"
 
 #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;
 using base::UserMetricsAction;
 using content::RecordAction;
 
 namespace content {
 
 namespace {
 // There can only be one content video view at a time, this holds onto that
@@ skipping 126 matching lines @@
         "MobileFullscreenVideo.LandscapeDuration",
         playback_duration_in_milliseconds_before_orientation_change);
     UMA_HISTOGRAM_COUNTS(
         "MobileFullscreenVideo.LandscapeRotation", orientation_changed);
   }
 }
 
 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);
 
   return JavaObjectWeakGlobalRef(
       env,
       Java_ContentVideoView_createContentVideoView(
           env,
           j_content_view_core.obj(),
           reinterpret_cast<intptr_t>(this)).obj());
 }
 }  // namespace content