Expose registered histograms from FeedbackCollector

chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.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.feedback;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.SystemClock;
 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;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.variations.VariationsAssociatedData;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.annotation.Nullable;
@@ skipping 40 matching lines @@
      * An optional description for the feedback report.
      */
     private String mDescription;
 
     /**
      * An optional screenshot for the feedback report.
      */
     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;
 
     /**
      * A flag indicating whether taking a screenshot has finished.
      */
     private boolean mScreenshotTaskFinished;
 
     /**
@@ skipping 36 matching lines @@
         mCallback = callback;
         mCollectionStartTime = SystemClock.elapsedRealtime();
         init(activity);
     }
 
     @VisibleForTesting
     void init(Activity activity) {
         postTimeoutTask();
         mConnectivityTask = ConnectivityTask.create(mProfile, CONNECTIVITY_CHECK_TIMEOUT_MS, this);
         ScreenshotTask.create(activity, this);
+        if (!mProfile.isOffTheRecord()) {
+            mHistograms = StatisticsRecorderAndroid.toJson();
+        }
     }
 
     /**
      * {@link ConnectivityTask.ConnectivityResult} implementation.
      */
     @Override
     public void onResult(ConnectivityTask.FeedbackData feedbackData) {
         ThreadUtils.assertOnUiThread();
         mConnectivityTaskFinished = true;
         Map<String, String> connectivityMap = feedbackData.toMap();
@@ skipping 84 matching lines @@
 
     /**
      * @return the screenshot to use for the feedback report.
      */
     @VisibleForTesting
     public Bitmap getScreenshot() {
         ThreadUtils.assertOnUiThread();
         return mScreenshot;
     }
 
+    public String getHistograms() {

[nyquist, 2016/10/03 20:55:38]

Nit: Add a comment as to what type of data this is. Where does it come from?
What format is it in? Etc.

[tbansal1, 2016/10/04 03:34:11]

I added a comment. Let me know if it is insufficient.

+        return mHistograms;
+    }
+
     /**
      * @return the collected data as a {@link Bundle}.
      */
     @VisibleForTesting
     public Bundle getBundle() {
         ThreadUtils.assertOnUiThread();
         addUrl();
         addConnectivityData();
         addDataReductionProxyData();
         addVariationsData();
@@ skipping 34 matching lines @@
     }
 
     private Bundle asBundle() {
         Bundle bundle = new Bundle();
         for (Map.Entry<String, String> entry : mData.entrySet()) {
             bundle.putString(entry.getKey(), entry.getValue());
         }
         return bundle;
     }
 }