Revert of Aura on Android: Fix link errors when building content_unittests_apk.

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 44 matching lines @@
 
     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;
 
     if (!device::android::RegisterBluetoothJni(env))
       return false;
 
     if (!media::RegisterJni(env))
       return false;
 
     if (!media::midi::RegisterJni(env))
       return false;
 
-#if !defined(USE_AURA)
-    if (!ui::shell_dialogs::RegisterJni(env))
-      return false;
-
     if (!ui::RegisterUIAndroidJni(env))
       return false;
-#endif
 
     g_jni_init_done = true;
   }
 
   return true;
 }
 
 bool LibraryLoaded(JNIEnv* env, jclass clazz) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
@@ skipping 27 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