Upstream version 10.38.208.0

[platform/framework/web/crosswalk.git] / src / base / android / base_jni_registrar.cc

diff --git a/src/base/android/base_jni_registrar.cc b/src/base/android/base_jni_registrar.cc
index 0645c73..b6d8a28 100644 (file)
--- a/src/base/android/base_jni_registrar.cc
+++ b/src/base/android/base_jni_registrar.cc
@@ -4,39 +4,44 @@
 
 #include "base/android/base_jni_registrar.h"
 
-#include "base/android/activity_status.h"
+#include "base/android/application_status_listener.h"
 #include "base/android/build_info.h"
+#include "base/android/command_line_android.h"
+#include "base/android/content_uri_utils.h"
 #include "base/android/cpu_features.h"
+#include "base/android/event_log.h"
+#include "base/android/field_trial_list.h"
 #include "base/android/important_file_writer_android.h"
 #include "base/android/java_handler_thread.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "base/android/jni_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/android/path_service_android.h"
 #include "base/android/path_utils.h"
 #include "base/android/sys_utils.h"
 #include "base/android/thread_utils.h"
+#include "base/android/trace_event_binding.h"
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_pump_android.h"
 #include "base/power_monitor/power_monitor_device_source_android.h"
 
-#if defined(GOOGLE_TV)
-#include "base/android/context_types.h"
-#endif
-
 namespace base {
 namespace android {
 
 static RegistrationMethod kBaseRegisteredMethods[] = {
-  { "ActivityStatus", base::android::ActivityStatus::RegisterBindings },
+  { "ApplicationStatusListener",
+      base::android::ApplicationStatusListener::RegisterBindings },
   { "BuildInfo", base::android::BuildInfo::RegisterBindings },
-#if defined(GOOGLE_TV)
-  { "ContextTypes", base::android::RegisterContextTypes },
-#endif
+  { "CommandLine", base::android::RegisterCommandLine },
+  { "ContentUriUtils", base::RegisterContentUriUtils },
   { "CpuFeatures", base::android::RegisterCpuFeatures },
+  { "EventLog", base::android::RegisterEventLog },
+  { "FieldTrialList", base::android::RegisterFieldTrialList },
   { "ImportantFileWriterAndroid",
     base::android::RegisterImportantFileWriterAndroid },
+  { "JNIUtils", base::android::RegisterJNIUtils },
   { "MemoryPressureListenerAndroid",
       base::android::MemoryPressureListenerAndroid::Register },
   { "JavaHandlerThread", base::android::JavaHandlerThread::RegisterBindings },
@@ -46,6 +51,7 @@ static RegistrationMethod kBaseRegisteredMethods[] = {
   { "SysUtils", base::android::SysUtils::Register },
   { "PowerMonitor", base::RegisterPowerMonitor },
   { "ThreadUtils", base::RegisterThreadUtils },
+  { "TraceEvent", base::android::RegisterTraceEvent },
 };
 
 bool RegisterJni(JNIEnv* env) {