Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / app / android / library_loader_hooks.cc

diff --git a/src/content/app/android/library_loader_hooks.cc b/src/content/app/android/library_loader_hooks.cc
index a424748..d09e21e 100644 (file)
--- a/src/content/app/android/library_loader_hooks.cc
+++ b/src/content/app/android/library_loader_hooks.cc
@@ -5,39 +5,33 @@
 #include "content/public/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"
 #include "base/android/jni_string.h"
-#include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/tracked_objects.h"
 #include "content/app/android/app_jni_registrar.h"
 #include "content/browser/android/browser_jni_registrar.h"
-#include "content/child/android/child_jni_registrar.h"
-#include "content/common/android/command_line.h"
 #include "content/common/android/common_jni_registrar.h"
+#include "content/common/content_constants_internal.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
-#include "jni/LibraryLoader_jni.h"
+#include "device/battery/android/battery_jni_registrar.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
-#include "ui/base/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
 
 namespace content {
 
-namespace {
-base::AtExitManager* g_at_exit_manager = NULL;
-}
-
 bool EnsureJniRegistered(JNIEnv* env) {
   static bool g_jni_init_done = false;
 
@@ -60,9 +54,6 @@ bool EnsureJniRegistered(JNIEnv* env) {
     if (!ui::shell_dialogs::RegisterJni(env))
       return false;
 
-    if (!content::android::RegisterChildJni(env))
-      return false;
-
     if (!content::android::RegisterCommonJni(env))
       return false;
 
@@ -72,6 +63,9 @@ bool EnsureJniRegistered(JNIEnv* env) {
     if (!content::android::RegisterAppJni(env))
       return false;
 
+    if (!device::android::RegisterBatteryJni(env))
+      return false;
+
     if (!media::RegisterJni(env))
       return false;
 
@@ -81,31 +75,30 @@ bool EnsureJniRegistered(JNIEnv* env) {
   return true;
 }
 
-static jint LibraryLoaded(JNIEnv* env, jclass clazz,
-                          jobjectArray init_command_line) {
-  InitNativeCommandLineFromJavaArray(env, init_command_line);
-
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
+bool LibraryLoaded(JNIEnv* env, jclass clazz) {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kTraceStartup)) {
     base::debug::CategoryFilter category_filter(
         command_line->GetSwitchValueASCII(switches::kTraceStartup));
-    base::debug::TraceLog::GetInstance()->SetEnabled(category_filter,
-        base::debug::TraceLog::RECORD_UNTIL_FULL);
+    base::debug::TraceLog::GetInstance()->SetEnabled(
+        category_filter,
+        base::debug::TraceLog::RECORDING_MODE,
+        base::debug::TraceOptions());
   }
 
+  // Android's main browser loop is custom so we set the browser
+  // name here as early as possible.
+  TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
+  base::debug::TraceLog::GetInstance()->SetProcessName("Browser");
+  base::debug::TraceLog::GetInstance()->SetProcessSortIndex(
+      kTraceEventBrowserProcessSortIndex);
+
   // Can only use event tracing after setting up the command line.
   TRACE_EVENT0("jni", "JNI_OnLoad continuation");
 
-  // Note: because logging is setup here right after copying the command line
-  // array from java to native up top of this method, any code that adds the
-  // --enable-dcheck switch must do so on the Java side.
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
-  settings.dcheck_state =
-      command_line->HasSwitch(switches::kEnableDCHECK) ?
-      logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS :
-      logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
   logging::InitLogging(settings);
   // To view log output with IDs and timestamps use "adb logcat -v threadtime".
   logging::SetLogItems(false,    // Process ID
@@ -115,35 +108,7 @@ static jint LibraryLoaded(JNIEnv* env, jclass clazz,
   VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
           << ", default verbosity = " << logging::GetVlogVerbosity();
 
-  if (!EnsureJniRegistered(env))
-    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
-
-  return 0;
-}
-
-static void RecordContentAndroidLinkerHistogram(
-    JNIEnv* env,
-    jclass clazz,
-    jboolean loaded_at_fixed_address_failed,
-    jboolean is_low_memory_device) {
-  UMA_HISTOGRAM_BOOLEAN("ContentAndroidLinker.LoadedAtFixedAddressFailed",
-                        loaded_at_fixed_address_failed);
-  UMA_HISTOGRAM_BOOLEAN("ContentAndroidLinker.IsLowMemoryDevice",
-                        is_low_memory_device);
-}
-
-void LibraryLoaderExitHook() {
-  if (g_at_exit_manager) {
-    delete g_at_exit_manager;
-    g_at_exit_manager = NULL;
-  }
-}
-
-bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
-  // We need the AtExitManager to be created at the very beginning.
-  g_at_exit_manager = new base::AtExitManager();
-
-  return RegisterNativesImpl(env);
+  return EnsureJniRegistered(env);
 }
 
 }  // namespace content