Revert of Add tests to make sure closed CCT activities are not leaked.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
index c63bd7d7f7aa65ebad23244c42ea2247bd614732..411f44b825cdbaa06ac749306e49aceb50b9b693 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -172,8 +172,6 @@
     private boolean mShouldUpdateTabCount = true;
     private boolean mShouldUpdateToolbarPrimaryColor = true;
 
-    private Runnable mDeferredStartupRunnable;
-
     /**
      * Creates a ToolbarManager object.
      *
@@ -824,12 +822,6 @@
         if (currentTab != null) currentTab.removeObserver(mTabObserver);
         mFindToolbarObservers.clear();
         mToolbar.destroy();
-        if (mDeferredStartupRunnable != null) {
-            // Run the runnable now, because there won't be any new data in the future.
-            ThreadUtils.getUiThreadHandler().removeCallbacks(mDeferredStartupRunnable);
-            mDeferredStartupRunnable.run();
-            mDeferredStartupRunnable = null;
-        }
     }
 
     /**
@@ -1128,17 +1120,13 @@
             final String activityName) {
         // Record startup performance statistics
         long elapsedTime = SystemClock.elapsedRealtime() - activityCreationTimeMs;
-        if (elapsedTime < RECORD_UMA_PERFORMANCE_METRICS_DELAY_MS
-                && mDeferredStartupRunnable == null) {
-            mDeferredStartupRunnable = new Runnable() {
+        if (elapsedTime < RECORD_UMA_PERFORMANCE_METRICS_DELAY_MS) {
+            ThreadUtils.postOnUiThreadDelayed(new Runnable() {
                 @Override
                 public void run() {
                     onDeferredStartup(activityCreationTimeMs, activityName);
-                    mDeferredStartupRunnable = null;
-                }
-            };
-            ThreadUtils.postOnUiThreadDelayed(mDeferredStartupRunnable,
-                    RECORD_UMA_PERFORMANCE_METRICS_DELAY_MS - elapsedTime);
+                }
+            }, RECORD_UMA_PERFORMANCE_METRICS_DELAY_MS - elapsedTime);
         }
         RecordHistogram.recordTimesHistogram("MobileStartup.ToolbarFirstDrawTime." + activityName,
                 mToolbar.getFirstDrawTime() - activityCreationTimeMs, TimeUnit.MILLISECONDS);