Measure time spent during StrictMode violations.

chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java
index 64556da21557eb3d7c934df3740730195592cc20..7ad679537f4c3b1d301c9298ba307c01486c9a50 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.test.InstrumentationTestCase;
 import android.text.TextUtils;
 
+import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.base.test.util.parameter.BaseParameter;
@@ -135,6 +136,7 @@ public abstract class MultiActivityTestBase extends InstrumentationTestCase
     @Override
     public void setUp() throws Exception {
         super.setUp();
+        RecordHistogram.disableForTests();
         mContext = getInstrumentation().getTargetContext();
         CommandLineFlags.setUp(mContext, getClass().getMethod(getName()));
         ApplicationTestUtils.setUp(mContext, true, true);
@@ -203,6 +205,7 @@ public abstract class MultiActivityTestBase extends InstrumentationTestCase
      *
      * @return a {@link Map} of {@link BaseParameter} objects to set as the available parameters.
      */
+    @Override
     public Map<String, BaseParameter> getAvailableParameters() {
         return mAvailableParameters;
     }
@@ -213,6 +216,7 @@ public abstract class MultiActivityTestBase extends InstrumentationTestCase
      * @param parameterTag a string with the name of the {@link BaseParameter} we want.
      * @return a parameter that extends {@link BaseParameter} that has the matching parameterTag.
      */
+    @Override
     @SuppressWarnings("unchecked")
     public <T extends BaseParameter> T getAvailableParameter(String parameterTag) {
         return (T) mAvailableParameters.get(parameterTag);
@@ -223,6 +227,7 @@ public abstract class MultiActivityTestBase extends InstrumentationTestCase
      *
      * @param parameterReader the {@link Parameter.Reader} to set.
      */
+    @Override
     public void setParameterReader(Parameter.Reader parameterReader) {
         mParameterReader = parameterReader;
         mAvailableParameters = createAvailableParameters();