Add support for TraceEvent before the native library is loaded.

content/browser/android/tracing_controller_android.cc

Index: content/browser/android/tracing_controller_android.cc
diff --git a/content/browser/android/tracing_controller_android.cc b/content/browser/android/tracing_controller_android.cc
index 4c40bb742975ab4a25e2e00f1d610d924151b745..dfef2b33dc266fbf3a26b40151fcdc2188f7b073 100644
--- a/content/browser/android/tracing_controller_android.cc
+++ b/content/browser/android/tracing_controller_android.cc
@@ -4,15 +4,63 @@
 
 #include "content/browser/android/tracing_controller_android.h"
 
+#include <vector>
+
+#include "base/android/early_trace_event.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/debug/trace_event.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
-#include "content/public/browser/tracing_controller.h"
+#include "content/browser/tracing/tracing_controller_impl.h"
 #include "jni/TracingControllerAndroid_jni.h"
 
+using base::debug::TraceLog;
+
 namespace content {
+namespace {
+
+const char kCategoryGroup[] = "Java";
+
+// Adds the early Java trace events (i.e. before the native library was called)
+// to the TraceEvent log before the data gets written to disk.
+void OnDisableRecording(TraceLog* trace_log) {
+  const unsigned char* const category_group_enabled =
+      TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(kCategoryGroup);
+
+  TraceLog::GetInstance()->SetEnabled(
+      base::debug::CategoryFilter(kCategoryGroup), TraceLog::RECORDING_MODE,
+      base::debug::TraceOptions());
+
+  std::vector<base::android::EarlyTraceEvent> trace_events;
+  base::android::GetAllEarlyTraceEvents(&trace_events);
+
+  for (std::vector<base::android::EarlyTraceEvent>::const_iterator it =
+           trace_events.begin();
+       it != trace_events.end(); ++it) {
+    const base::android::EarlyTraceEvent& trace_event = *it;
+    const struct {
+      const char phase;
+      const base::TimeTicks timestamp;
+      const base::TimeTicks thread_time;
+    } phases[] = {
+      { TRACE_EVENT_PHASE_BEGIN, trace_event.begin_timestamp,
+        trace_event.begin_thread_time },
+      { TRACE_EVENT_PHASE_END, trace_event.end_timestamp,
+        trace_event.end_thread_time },
+    };
+
+    for (size_t i = 0; i < sizeof(phases) / sizeof(phases[0]); ++i) {
+      trace_log->AddCustomTraceEvent(
+          phases[i].phase, category_group_enabled, trace_event.name.c_str(),
+          trace_event.thread_id, phases[i].timestamp, phases[i].thread_time);
+    }
+  }
+
+  TraceLog::GetInstance()->SetDisabled();
+}
+
+}  // namespace
 
 static jlong Init(JNIEnv* env, jobject obj) {
   TracingControllerAndroid* profiler = new TracingControllerAndroid(env, obj);
@@ -29,6 +77,11 @@ void TracingControllerAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
+void TracingControllerAndroid::SetupEarlyJavaTracing() {
+  TracingControllerImpl::GetInstance()->SetDisableRecordingCallback(
+      base::Bind(&OnDisableRecording));
+}
+
 bool TracingControllerAndroid::StartTracing(JNIEnv* env,
                                             jobject obj,
                                             jstring jcategories,