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

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.document;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Notification;
 import android.app.SearchManager;
@@ skipping 98 matching lines @@
 
     /**
      * Figure out how to route the Intent.  Because this is on the critical path to startup, please
      * avoid making the pathway any more complicated than it already is.  Make sure that anything
      * you add _absolutely has_ to be here.
      */
     @Override
     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());
         // Initialize the command line in case we've disabled document mode from there.
         CommandLineInitUtil.initCommandLine(this, ChromeApplication.COMMAND_LINE_FILE);
 
         // Read partner browser customizations information asynchronously.
         // We want to initialize early because when there is no tabs to restore, we should possibly
         // show homepage, which might require reading PartnerBrowserCustomizations provider.
         PartnerBrowserCustomizations.initializeAsync(getApplicationContext(),
@@ skipping 85 matching lines @@
             return;
         }
 
         // All possible bounces to other activities should have already been enumerated above.
         Log.e(TAG, "User wasn't sent to another Activity.");
         assert false;
         ApiCompatibilityUtils.finishAndRemoveTask(this);
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
+    public void onPause() {
+        super.onPause();
         TraceEvent.end("ChromeLauncherActivity");
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == FIRST_RUN_EXPERIENCE_REQUEST_CODE) {
             if (resultCode == Activity.RESULT_OK) {
                 // User might have opted out during FRE, so check again.
                 if (mIsCustomTabIntent) {
@@ skipping 248 matching lines @@
         IntentHandler.ExternalAppId source =
                 IntentHandler.determineExternalIntentSource(getPackageName(), intent);
         if (intent.getPackage() == null && source != IntentHandler.ExternalAppId.CHROME) {
             int flagsOfInterest = Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
             int maskedFlags = intent.getFlags() & flagsOfInterest;
             sIntentFlagsHistogram.record(maskedFlags);
         }
         MediaNotificationUma.recordClickSource(intent);
     }
 }