Revert of Aura on Android: content/browser

content/app/android/library_loader_hooks.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/app/android/library_loader_hooks.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/command_line_android.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
@@ skipping 17 matching lines @@
 #include "device/bluetooth/android/bluetooth_jni_registrar.h"
 #include "device/usb/android/usb_jni_registrar.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "media/midi/midi_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "ui/android/ui_android_jni_registrar.h"
 #include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/events/android/events_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
-
-#if !defined(USE_AURA)
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
-#endif
 
 namespace content {
 
 bool EnsureJniRegistered(JNIEnv* env) {
   static bool g_jni_init_done = false;
 
   if (!g_jni_init_done) {
     if (!base::android::RegisterJni(env))
       return false;
 
     if (!gfx::android::RegisterJni(env))
       return false;
 
     if (!net::android::RegisterJni(env))
       return false;
 
     if (!ui::android::RegisterJni(env))
       return false;
 
     if (!ui::gl::android::RegisterJni(env))
       return false;
 
     if (!ui::events::android::RegisterJni(env))
       return false;
 
-#if !defined(USE_AURA)
     if (!ui::shell_dialogs::RegisterJni(env))
       return false;
-#endif
 
     if (!content::android::RegisterCommonJni(env))
       return false;
 
     if (!content::android::RegisterBrowserJni(env))
       return false;
 
     if (!content::android::RegisterAppJni(env))
       return false;
 
@@ skipping 60 matching lines @@
                        false,    // Thread ID
                        false,    // Timestamp
                        false);   // Tick count
   VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
           << ", default verbosity = " << logging::GetVlogVerbosity();
 
   return true;
 }
 
 }  // namespace content