Revert "Add stats to distinguish android renderer crashes."

chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.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.tab;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.IntDef;
 import android.view.View;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.Log;
 import org.chromium.base.ObserverList.RewindableIterator;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
@@ skipping 18 matching lines @@
 
     /** Used for logging. */
     private static final String TAG = "TabWebContentsObs";
 
     // TabRendererCrashStatus defined in tools/metrics/histograms/histograms.xml.
     private static final int TAB_RENDERER_CRASH_STATUS_SHOWN_IN_FOREGROUND_APP = 0;
     private static final int TAB_RENDERER_CRASH_STATUS_HIDDEN_IN_FOREGROUND_APP = 1;
     private static final int TAB_RENDERER_CRASH_STATUS_HIDDEN_IN_BACKGROUND_APP = 2;
     private static final int TAB_RENDERER_CRASH_STATUS_MAX = 3;
 
-    // TabRendererExitStatus defined in tools/metrics/histograms/histograms.xml.
-    // Designed to replace TabRendererCrashStatus if numbers line up.
-    @IntDef({TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_RUNNING_APP,
-        TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_PAUSED_APP,
-        TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_BACKGROUND_APP,
-        TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_RUNNING_APP,
-        TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_PAUSED_APP,
-        TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_BACKGROUND_APP,
-        TAB_RENDERER_EXIT_STATUS_MAX})
-    private @interface TabRendererExitStatus {}
-    private static final int TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_RUNNING_APP = 0;
-    private static final int TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_PAUSED_APP = 1;
-    private static final int TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_BACKGROUND_APP = 2;
-    private static final int TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_RUNNING_APP = 3;
-    private static final int TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_PAUSED_APP = 4;
-    private static final int TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_BACKGROUND_APP = 5;
-    private static final int TAB_RENDERER_EXIT_STATUS_MAX = 6;
-
     private final Tab mTab;
     private int mThemeColor;
 
     public TabWebContentsObserver(WebContents webContents, Tab tab) {
         super(webContents);
         mTab = tab;
         mThemeColor = mTab.getDefaultThemeColor();
     }
 
     @Override
     public void renderProcessGone(boolean processWasOomProtected) {
         Log.i(TAG, "renderProcessGone() for tab id: " + mTab.getId()
                 + ", oom protected: " + Boolean.toString(processWasOomProtected)
                 + ", already needs reload: " + Boolean.toString(mTab.needsReload()));
         // Do nothing for subsequent calls that happen while the tab remains crashed. This
         // can occur when the tab is in the background and it shares the renderer with other
         // tabs. After the renderer crashes, the WebContents of its tabs are still around
         // and they still share the RenderProcessHost. When one of the tabs reloads spawning
         // a new renderer for the shared RenderProcessHost and the new renderer crashes
         // again, all tabs sharing this renderer will be notified about the crash (including
         // potential background tabs that did not reload yet).
         if (mTab.needsReload() || mTab.isShowingSadTab()) return;
 
-        // This will replace TabRendererCrashStatus if numbers line up.
-        int appState = ApplicationStatus.getStateForApplication();
-        boolean applicationRunning = (appState == ApplicationState.HAS_RUNNING_ACTIVITIES);
-        boolean applicationPaused = (appState == ApplicationState.HAS_PAUSED_ACTIVITIES);
-        @TabRendererExitStatus int rendererExitStatus = TAB_RENDERER_EXIT_STATUS_MAX;
-        if (processWasOomProtected) {
-            if (applicationRunning) {
-                rendererExitStatus = TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_RUNNING_APP;
-            } else if (applicationPaused) {
-                rendererExitStatus = TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_PAUSED_APP;
-            } else {
-                rendererExitStatus = TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_BACKGROUND_APP;
-            }
-        } else {
-            if (applicationRunning) {
-                rendererExitStatus = TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_RUNNING_APP;
-            } else if (applicationPaused) {
-                rendererExitStatus = TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_PAUSED_APP;
-            } else {
-                rendererExitStatus = TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_BACKGROUND_APP;
-            }
-        }
-        RecordHistogram.recordEnumeratedHistogram(
-                "Tab.RendererExitStatus", rendererExitStatus, TAB_RENDERER_EXIT_STATUS_MAX);
-
         int activityState = ApplicationStatus.getStateForActivity(
                 mTab.getWindowAndroid().getActivity().get());
         int rendererCrashStatus = TAB_RENDERER_CRASH_STATUS_MAX;
         if (!processWasOomProtected
                 || activityState == ActivityState.PAUSED
                 || activityState == ActivityState.STOPPED
                 || activityState == ActivityState.DESTROYED) {
             // The tab crashed in background or was killed by the OS out-of-memory killer.
             //setNeedsReload(true);
             mTab.setNeedsReload(true);
-            if (applicationRunning) {
+            if (ApplicationStatus.getStateForApplication()
+                    == ApplicationState.HAS_RUNNING_ACTIVITIES) {
                 rendererCrashStatus = TAB_RENDERER_CRASH_STATUS_HIDDEN_IN_FOREGROUND_APP;
             } else {
                 rendererCrashStatus = TAB_RENDERER_CRASH_STATUS_HIDDEN_IN_BACKGROUND_APP;
             }
         } else {
             rendererCrashStatus = TAB_RENDERER_CRASH_STATUS_SHOWN_IN_FOREGROUND_APP;
             mTab.showSadTab();
             // This is necessary to correlate histogram data with stability counts.
             UmaSessionStats.logRendererCrash();
         }
@@ skipping 202 matching lines @@
      * @return The theme-color for this web contents.
      */
     int getThemeColor() {
         return mThemeColor;
     }
 
     private static boolean isThemeColorEnabled(Context context) {
         return !DeviceFormFactor.isTablet(context);
     }
 }