Revert the unused ManageInterests histogram and make it obsolete.

Bug: 1035491
Change-Id: I753b551900e7646558031f36b2ab011f671c3c61
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2006308Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
Reviewed-by: Brian White <bcwhite@chromium.org>
Commit-Queue: Jonathan Freed <freedjm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734186}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLoggingBridge.java

@@ -373,15 +373,6 @@ public class FeedLoggingBridge implements BasicLoggingApi {
                 mNativeFeedLoggingBridge, FeedLoggingBridge.this);
     }
 
-    private void onManageInterestsClicked(int position) {
-        // Bridge could have been destroyed for policy when this is called.
-        // See https://crbug.com/901414.
-        if (mNativeFeedLoggingBridge == 0) return;
-
-        FeedLoggingBridgeJni.get().onManageInterestsClicked(
-                mNativeFeedLoggingBridge, FeedLoggingBridge.this, position);
-    }
-
     /**
      * One-shot reporter that records the first time the user scrolls in the {@link Stream}.
      */
@@ -463,7 +454,5 @@ public class FeedLoggingBridge implements BasicLoggingApi {
         void onContentTargetVisited(long nativeFeedLoggingBridge, FeedLoggingBridge caller,
                 long visitTimeMs, boolean isOffline, boolean returnToNtp);
         void reportScrolledAfterOpen(long nativeFeedLoggingBridge, FeedLoggingBridge caller);
-        void onManageInterestsClicked(
-                long nativeFeedLoggingBridge, FeedLoggingBridge caller, int position);
     }
 }

chrome/browser/android/feed/feed_logging_bridge.cc

@@ -276,10 +276,4 @@ void FeedLoggingBridge::ReportScrolledAfterOpen(
   feed_logging_metrics_->ReportScrolledAfterOpen();
 }
 
-void FeedLoggingBridge::OnManageInterestsClicked(JNIEnv* j_env,
-                                                 const JavaRef<jobject>& j_this,
-                                                 const jint j_position) {
-  feed_logging_metrics_->OnManageInterestsClicked(j_position);
-}
-
 }  // namespace feed

chrome/browser/android/feed/feed_logging_bridge.h

@@ -160,10 +160,6 @@ class FeedLoggingBridge {
   void ReportScrolledAfterOpen(JNIEnv* j_env,
                                const base::android::JavaRef<jobject>& j_this);
 
-  void OnManageInterestsClicked(JNIEnv* j_env,
-                                const base::android::JavaRef<jobject>& j_this,
-                                const jint j_position);
-
  private:
   FeedLoggingMetrics* feed_logging_metrics_;
 

components/feed/core/feed_logging_metrics.cc

@@ -631,11 +631,6 @@ void FeedLoggingMetrics::OnMoreButtonClicked(int position) {
       kMaxSuggestionsForArticle + 1);
 }
 
-void FeedLoggingMetrics::OnManageInterestsClicked(int position) {
-  base::UmaHistogramExactLinear("ContentSuggestions.Feed.ManageInterestsOpened",
-                                position, kMaxSuggestionsTotal);
-}
-
 void FeedLoggingMetrics::OnNotInterestedInSource(int position, bool committed) {
   RecordUndoableActionUMA(
       "ContentSuggestions.Feed.InterestHeader.NotInterestedInSource", position,

components/feed/core/feed_logging_metrics.h

@@ -86,8 +86,6 @@ class FeedLoggingMetrics {
 
   void OnNotInterestedInTopic(int position, bool committed);
 
-  void OnManageInterestsClicked(int position);
-
   void OnSpinnerStarted(int spinner_type);
 
   void OnSpinnerFinished(base::TimeDelta shown_time, int spinner_type);

components/feed/core/feed_logging_metrics_unittest.cc

@@ -259,13 +259,4 @@ TEST_F(FeedLoggingMetricsTest, ShouldLogOnMoreButtonClicked) {
               SizeIs(1));
 }
 
-TEST_F(FeedLoggingMetricsTest, ShouldLogOnManageInterestsClicked) {
-  base::HistogramTester histogram_tester;
-
-  feed_logging_metrics()->OnManageInterestsClicked(1);
-  EXPECT_THAT(histogram_tester.GetAllSamples(
-                  "ContentSuggestions.Feed.ManageInterestsOpened"),
-              ElementsAre(base::Bucket(/*min=*/1, /*count=*/1)));
-}
-
 }  // namespace feed

tools/metrics/histograms/histograms.xml

@@ -26105,6 +26105,10 @@ uploading your change for review.
 
 <histogram name="ContentSuggestions.Feed.ManageInterestsOpened" units="index"
     expires_after="2020-10-01">
+  <obsolete>
+    This implementation is incorrect and we are now using
+    NewTabPage.ActionAndroid2 instead. Marked obsolete in 01-2020
+  </obsolete>
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>