Record UMA for NoticeCardFulfilled

Bug: b/162435720 Change-Id: If23e4026e65ea28c6f78c7064dc05bb6c7cfcf86 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354417 Commit-Queue: Dan H <harringtond@chromium.org> Reviewed-by: Ian Wells <iwells@chromium.org> Cr-Commit-Position: refs/heads/master@{#798269}
Denger-Network · Aug 14, 2020 · 9e85646 · 9e85646
1 parent b179b12
commit 9e85646
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 1 deletion.
diff --git a/components/feed/core/v2/feed_stream_unittest.cc b/components/feed/core/v2/feed_stream_unittest.cc
@@ -19,6 +19,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/test/bind_test_util.h"
+#include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_run_loop_timeout.h"
 #include "base/test/simple_test_clock.h"
 #include "base/test/simple_test_tick_clock.h"
@@ -35,6 +36,7 @@
 #include "components/feed/core/v2/feed_network.h"
 #include "components/feed/core/v2/image_fetcher.h"
 #include "components/feed/core/v2/metrics_reporter.h"
+#include "components/feed/core/v2/prefs.h"
 #include "components/feed/core/v2/protocol_translator.h"
 #include "components/feed/core/v2/refresh_task_scheduler.h"
 #include "components/feed/core/v2/scheduling.h"
@@ -1396,11 +1398,22 @@ TEST_F(FeedStreamTest, LoadMoreBeforeLoad) {
 }
 
 TEST_F(FeedStreamTest, ReadNetworkResponse) {
+  base::HistogramTester histograms;
   network_.InjectRealResponse();
   TestSurface surface(stream_.get());
   WaitForIdleTaskQueue();
 
   ASSERT_EQ("loading -> 10 slices", surface.DescribeUpdates());
+
+  // Verify we're processing some of the data on the request.
+
+  // The response has a privacy_notice_fulfilled=true.
+  histograms.ExpectUniqueSample("ContentSuggestions.Feed.NoticeCardFulfilled",
+                                1, 1);
+
+  // A request schedule with two entries was in the response.
+  RequestSchedule schedule = prefs::GetRequestSchedule(profile_prefs_);
+  EXPECT_EQ(std::vector<base::TimeDelta>({}), schedule.refresh_offsets);
 }
 
 TEST_F(FeedStreamTest, ClearAllAfterLoadResultsInRefresh) {

diff --git a/components/feed/core/v2/metrics_reporter.cc b/components/feed/core/v2/metrics_reporter.cc
@@ -453,6 +453,11 @@ void MetricsReporter::OnUploadActions(UploadActionsStatus status) {
                                 status);
 }
 
+void MetricsReporter::NoticeCardFulfilled(bool response_has_notice_card) {
+  base::UmaHistogramBoolean("ContentSuggestions.Feed.NoticeCardFulfilled",
+                            response_has_notice_card);
+}
+
 void MetricsReporter::SurfaceReceivedContent(SurfaceId surface_id) {
   ReportGetMoreIfNeeded(surface_id, true);
 }

diff --git a/components/feed/core/v2/metrics_reporter.h b/components/feed/core/v2/metrics_reporter.h
@@ -116,6 +116,8 @@ class MetricsReporter {
   static void OnUploadActionsBatch(UploadActionsBatchStatus status);
   static void OnUploadActions(UploadActionsStatus status);
 
+  static void NoticeCardFulfilled(bool response_has_notice_card);
+
  private:
   base::WeakPtr<MetricsReporter> GetWeakPtr() {
     return weak_ptr_factory_.GetWeakPtr();

diff --git a/components/feed/core/v2/tasks/load_stream_task.cc b/components/feed/core/v2/tasks/load_stream_task.cc
@@ -18,6 +18,7 @@
 #include "components/feed/core/proto/v2/wire/request.pb.h"
 #include "components/feed/core/v2/feed_network.h"
 #include "components/feed/core/v2/feed_stream.h"
+#include "components/feed/core/v2/metrics_reporter.h"
 #include "components/feed/core/v2/proto_util.h"
 #include "components/feed/core/v2/protocol_translator.h"
 #include "components/feed/core/v2/stream_model.h"
@@ -152,6 +153,11 @@ void LoadStreamTask::QueryRequestComplete(
   if (!response_data.model_update_request)
     return Done(LoadStreamStatus::kProtoTranslationFailed);
 
+  MetricsReporter::NoticeCardFulfilled(result.response_body->feed_response()
+                                           .feed_response_metadata()
+                                           .chrome_feed_response_metadata()
+                                           .privacy_notice_fulfilled());
+
   loaded_new_content_from_network_ = true;
   stream_->GetStore()->OverwriteStream(
       std::make_unique<StreamModelUpdateRequest>(

diff --git a/components/feed/core/v2/testdata/response.textproto b/components/feed/core/v2/testdata/response.textproto
@@ -466,11 +466,17 @@ feed_response {
           seconds: 86308
           nanos: 822963644
         }
+        refresh_time_from_response_time {
+          seconds: 120000
+        }
       }
     }
   }
   feed_response_metadata {
-    response_time_ms: 1587056924
+    #response_time_ms: 1587056924
+    chrome_feed_response_metadata {
+      privacy_notice_fulfilled: true
+    }
   }
 }
 
diff --git a/components/test/data/feed/response.binarypb b/components/test/data/feed/response.binarypb