| 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 e388e65934b35451400d9fc7bb1ccec1c2c17cb5..fc9296f5f0a592bf02dc84f36ed7eac82bd8ce93 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
|
| @@ -13,9 +13,6 @@ 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.ChromeVersionInfo;
|
| -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;
|
| @@ -259,7 +256,6 @@ public class FeedbackCollector
|
| addConnectivityData();
|
| addDataReductionProxyData();
|
| addVariationsData();
|
| - addBlimpData();
|
| return asBundle();
|
| }
|
|
|
| @@ -287,15 +283,6 @@ public class FeedbackCollector
|
| mData.putAll(VariationsAssociatedData.getFeedbackMap());
|
| }
|
|
|
| - private void addBlimpData() {
|
| - if (mProfile.isOffTheRecord()) return;
|
| - // Only collects data for Blimp in local or canary build. See crbug/653721.
|
| - if (!ChromeVersionInfo.isCanaryBuild() && !ChromeVersionInfo.isLocalBuild()) return;
|
| - BlimpClientContext blimpClientContext =
|
| - BlimpClientContextFactory.getBlimpClientContextForProfile(mProfile);
|
| - mData.putAll(blimpClientContext.getFeedbackMap());
|
| - }
|
| -
|
| private Bundle asBundle() {
|
| Bundle bundle = new Bundle();
|
| for (Map.Entry<String, String> entry : mData.entrySet()) {
|
|
|