Revert of Android: Add support for TraceEvent before the native library is loaded.

chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
index 5c9a66549cfb9c2294c7de4c0488a7519e8f1a92..411b08ebd0dd0ed68426e9881b84c18c38b90f29 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
@@ -116,22 +116,16 @@
     public void onCreate(Bundle savedInstanceState) {
         // Third-party code adds disk access to Activity.onCreate. http://crbug.com/619824
         StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
-        TraceEvent.begin("ChromeLauncherActivity");
-        TraceEvent.begin("ChromeLauncherActivity.onCreate");
         try {
-            doOnCreate(savedInstanceState);
+            super.onCreate(savedInstanceState);
         } finally {
             StrictMode.setThreadPolicy(oldPolicy);
-            TraceEvent.end("ChromeLauncherActivity.onCreate");
-        }
-    }
-
-    private final void doOnCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+        }
         // This Activity is only transient. It launches another activity and
         // terminates itself. However, some of the work is performed outside of
         // {@link Activity#onCreate()}. To capture this, the TraceEvent starts
         // in onCreate(), and ends in onPause().
+        TraceEvent.begin("ChromeLauncherActivity");
         // Needs to be called as early as possible, to accurately capture the
         // time at which the intent was received.
         IntentHandler.addTimestampToIntent(getIntent());
@@ -237,8 +231,8 @@
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
+    public void onPause() {
+        super.onPause();
         TraceEvent.end("ChromeLauncherActivity");
     }