| Index: chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
|
| index 367923725a0e81d2a9194f4926d89e83fae5d731..e5820d4f7c3c0afd6818e1b6750b4366891148df 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
|
| @@ -12,6 +12,7 @@ import android.text.TextUtils;
|
|
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.VisibleForTesting;
|
| +import org.chromium.base.metrics.StatisticsRecorderAndroid;
|
| import org.chromium.blimp_public.BlimpClientContext;
|
| import org.chromium.chrome.browser.blimp.BlimpClientContextFactory;
|
| import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
|
| @@ -72,6 +73,11 @@ public class FeedbackCollector
|
| private Bitmap mScreenshot;
|
|
|
| /**
|
| + * All the registered histograms as JSON text.
|
| + */
|
| + private String mHistograms;
|
| +
|
| + /**
|
| * A flag indicating whether gathering connection data has finished.
|
| */
|
| private boolean mConnectivityTaskFinished;
|
| @@ -128,6 +134,9 @@ public class FeedbackCollector
|
| postTimeoutTask();
|
| mConnectivityTask = ConnectivityTask.create(mProfile, CONNECTIVITY_CHECK_TIMEOUT_MS, this);
|
| ScreenshotTask.create(activity, this);
|
| + if (!mProfile.isOffTheRecord()) {
|
| + mHistograms = StatisticsRecorderAndroid.toJson();
|
| + }
|
| }
|
|
|
| /**
|
| @@ -233,6 +242,13 @@ public class FeedbackCollector
|
| }
|
|
|
| /**
|
| + * @return All the registered histograms as JSON text.
|
| + */
|
| + public String getHistograms() {
|
| + return mHistograms;
|
| + }
|
| +
|
| + /**
|
| * @return the collected data as a {@link Bundle}.
|
| */
|
| @VisibleForTesting
|
|
|