Remove OptimizationGuideUKM logging from PreviewsUKMObserver

Code to even log this from Previews land was removed in M79

Change-Id: I649467f73f909f73cba940f32710196ab2807023
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1988852Reviewed-by: Robert Ogden <robertogden@chromium.org>
Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
Commit-Queue: Sophie Chang <sophiechang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728690}

chrome/browser/page_load_metrics/observers/previews_ukm_observer.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/page_load_metrics/observers/previews_ukm_observer.h"
 
-#include "base/base64.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/optional.h"
@@ -18,7 +17,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
 #include "components/offline_pages/buildflags/buildflags.h"
-#include "components/optimization_guide/proto/hints.pb.h"
 #include "components/page_load_metrics/browser/page_load_metrics_observer.h"
 #include "components/page_load_metrics/browser/page_load_metrics_util.h"
 #include "components/page_load_metrics/common/page_load_timing.h"
@@ -144,9 +142,6 @@ PreviewsUKMObserver::OnCommit(content::NavigationHandle* navigation_handle,
   offline_eligibility_reason_ = previews_user_data->EligibilityReasonForPreview(
       previews::PreviewsType::OFFLINE);
 
-  serialized_hint_version_string_ =
-      previews_user_data->serialized_hint_version_string();
-
   return CONTINUE_OBSERVING;
 }
 
@@ -174,7 +169,7 @@ page_load_metrics::PageLoadMetricsObserver::ObservePolicy
 PreviewsUKMObserver::FlushMetricsOnAppEnterBackground(
     const page_load_metrics::mojom::PageLoadTiming& timing) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  RecordMetrics();
+  RecordPreviewsTypes();
   return STOP_OBSERVING;
 }
 
@@ -182,19 +177,14 @@ page_load_metrics::PageLoadMetricsObserver::ObservePolicy
 PreviewsUKMObserver::OnHidden(
     const page_load_metrics::mojom::PageLoadTiming& timing) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  RecordMetrics();
+  RecordPreviewsTypes();
   return STOP_OBSERVING;
 }
 
 void PreviewsUKMObserver::OnComplete(
     const page_load_metrics::mojom::PageLoadTiming& timing) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  RecordMetrics();
-}
-
-void PreviewsUKMObserver::RecordMetrics() {
   RecordPreviewsTypes();
-  RecordOptimizationGuideInfo();
 }
 
 void PreviewsUKMObserver::RecordPreviewsTypes() {
@@ -281,35 +271,6 @@ void PreviewsUKMObserver::RecordPreviewsTypes() {
   builder.Record(ukm::UkmRecorder::Get());
 }
 
-void PreviewsUKMObserver::RecordOptimizationGuideInfo() {
-  if (!serialized_hint_version_string_.has_value()) {
-    return;
-  }
-
-  // Deserialize the serialized version string into its protobuffer.
-  std::string binary_version_pb;
-  if (!base::Base64Decode(serialized_hint_version_string_.value(),
-                          &binary_version_pb))
-    return;
-
-  optimization_guide::proto::Version hint_version;
-  if (!hint_version.ParseFromString(binary_version_pb))
-    return;
-
-  ukm::builders::OptimizationGuide builder(GetDelegate().GetSourceId());
-  if (hint_version.has_generation_timestamp() &&
-      hint_version.generation_timestamp().seconds() > 0) {
-    builder.SetHintGenerationTimestamp(
-        hint_version.generation_timestamp().seconds());
-  }
-  if (hint_version.has_hint_source() &&
-      hint_version.hint_source() !=
-          optimization_guide::proto::HINT_SOURCE_UNKNOWN) {
-    builder.SetHintSource(static_cast<int>(hint_version.hint_source()));
-  }
-  builder.Record(ukm::UkmRecorder::Get());
-}
-
 void PreviewsUKMObserver::OnEventOccurred(const void* const event_key) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (event_key == PreviewsUITabHelper::OptOutEventKey())

chrome/browser/page_load_metrics/observers/previews_ukm_observer.h

@@ -55,9 +55,7 @@ class PreviewsUKMObserver : public page_load_metrics::PageLoadMetricsObserver {
   virtual bool IsOfflinePreview(content::WebContents* web_contents) const;
 
  private:
-  void RecordMetrics();
   void RecordPreviewsTypes();
-  void RecordOptimizationGuideInfo();
 
   // The preview type that was actually committed and seen by the user.
   PreviewsType committed_preview_;
@@ -85,7 +83,6 @@ class PreviewsUKMObserver : public page_load_metrics::PageLoadMetricsObserver {
   base::Optional<previews::PreviewsEligibilityReason>
       offline_eligibility_reason_;
   base::Optional<base::TimeDelta> navigation_restart_penalty_;
-  base::Optional<std::string> serialized_hint_version_string_;
 
   SEQUENCE_CHECKER(sequence_checker_);
 

components/previews/content/previews_user_data.cc

@@ -33,8 +33,7 @@ PreviewsUserData::PreviewsUserData(const PreviewsUserData& other)
       committed_previews_state_without_holdback_(
           other.committed_previews_state_without_holdback_),
       coin_flip_holdback_result_(other.coin_flip_holdback_result_),
-      preview_eligibility_reasons_(other.preview_eligibility_reasons_),
-      serialized_hint_version_string_(other.serialized_hint_version_string_) {
+      preview_eligibility_reasons_(other.preview_eligibility_reasons_) {
   if (other.server_lite_page_info_) {
     server_lite_page_info_ =
         std::make_unique<ServerLitePageInfo>(*other.server_lite_page_info_);

components/previews/content/previews_user_data.h

@@ -181,15 +181,6 @@ class PreviewsUserData {
     server_lite_page_info_ = std::move(info);
   }
 
-  // The serialized hints version for the hint that was used for the page load.
-  base::Optional<std::string> serialized_hint_version_string() const {
-    return serialized_hint_version_string_;
-  }
-  void set_serialized_hint_version_string(
-      const std::string& serialized_hint_version_string) {
-    serialized_hint_version_string_ = serialized_hint_version_string;
-  }
-
  private:
   // A session unique ID related to this navigation.
   const uint64_t page_id_;
@@ -247,9 +238,6 @@ class PreviewsUserData {
   std::unordered_map<PreviewsType, PreviewsEligibilityReason>
       preview_eligibility_reasons_ = {};
 
-  // The serialized hints version for the hint that was used for the page load.
-  base::Optional<std::string> serialized_hint_version_string_ = base::nullopt;
-
   DISALLOW_ASSIGN(PreviewsUserData);
 };
 

components/previews/content/previews_user_data_unittest.cc

@@ -46,7 +46,6 @@ TEST(PreviewsUserDataTest, DeepCopy) {
   EXPECT_FALSE(data->black_listed_for_lite_page());
   EXPECT_FALSE(data->offline_preview_used());
   EXPECT_EQ(data->server_lite_page_info(), nullptr);
-  EXPECT_EQ(base::nullopt, data->serialized_hint_version_string());
 
   base::TimeTicks now = base::TimeTicks::Now();
 
@@ -58,7 +57,6 @@ TEST(PreviewsUserDataTest, DeepCopy) {
   data->set_server_lite_page_info(
       std::make_unique<PreviewsUserData::ServerLitePageInfo>());
   data->server_lite_page_info()->original_navigation_start = now;
-  data->set_serialized_hint_version_string("someversion");
 
   PreviewsUserData data_copy(*data);
   EXPECT_EQ(id, data_copy.page_id());
@@ -71,7 +69,6 @@ TEST(PreviewsUserDataTest, DeepCopy) {
   EXPECT_TRUE(data_copy.offline_preview_used());
   EXPECT_NE(data->server_lite_page_info(), nullptr);
   EXPECT_EQ(data->server_lite_page_info()->original_navigation_start, now);
-  EXPECT_EQ("someversion", data->serialized_hint_version_string());
 }
 
 TEST(PreviewsUserDataTest, TestCoinFlip_HasCommittedPreviewsType) {