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

content/public/test/content_test_suite_base.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/public/test/content_test_suite_base.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 72 matching lines @@
 
 #if defined(OS_ANDROID)
   // Register JNI bindings for android.
   JNIEnv* env = base::android::AttachCurrentThread();
   content::android::RegisterCommonJni(env);
   content::android::RegisterBrowserJni(env);
   gfx::android::RegisterJni(env);
   media::RegisterJni(env);
   net::android::RegisterJni(env);
   ui::android::RegisterJni(env);
+  ui::RegisterUIAndroidJni(env);
   ui::gl::android::RegisterJni(env);
   ui::events::android::RegisterJni(env);
 #if !defined(USE_AURA)
-  ui::RegisterUIAndroidJni(env);
   ui::shell_dialogs::RegisterJni(env);
   content::Compositor::Initialize();
 #endif
 #endif
 
 #if defined(USE_OZONE)
   ui::OzonePlatform::InitializeForUI();
 #endif
 
   testing::UnitTest::GetInstance()->listeners().Append(
@@ skipping 11 matching lines @@
 #if !defined(OS_IOS)
   UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(
       CreateInProcessUtilityThread);
   RenderProcessHostImpl::RegisterRendererMainThreadFactory(
       CreateInProcessRendererThread);
   GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
 #endif
 }
 
 }  // namespace content