Continue evaluating hint logic even if target is not painful

Bug: 969558
Change-Id: I842006ad992bec31b814205b6fae6ddb0f698414
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1856662Reviewed-by: Michael Crouse <mcrouse@chromium.org>
Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Commit-Queue: Sophie Chang <sophiechang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708604}

chrome/browser/optimization_guide/optimization_guide_hints_manager.cc

@@ -744,20 +744,22 @@ void OptimizationGuideHintsManager::CanApplyOptimization(
   *optimization_type_decision =
       optimization_guide::OptimizationTypeDecision::kUnknown;
 
-  // We only support the optimization target
-  // |OPTIMIZATION_TARGET_PAINFUL_PAGE_LOAD|, so just return that we don't know
-  // if the target doesn't match that.
+  bool should_update_optimization_target_decision = true;
   if (optimization_target !=
       optimization_guide::proto::OPTIMIZATION_TARGET_PAINFUL_PAGE_LOAD) {
-    return;
+    *optimization_target_decision = optimization_guide::
+        OptimizationTargetDecision::kModelNotAvailableOnClient;
+    should_update_optimization_target_decision = false;
   }
 
   const auto& url = navigation_handle->GetURL();
   // If the URL doesn't have a host, we cannot query the hint for it, so just
   // return early.
   if (!url.has_host()) {
-    *optimization_target_decision =
-        optimization_guide::OptimizationTargetDecision::kPageLoadDoesNotMatch;
+    if (should_update_optimization_target_decision) {
+      *optimization_target_decision =
+          optimization_guide::OptimizationTargetDecision::kPageLoadDoesNotMatch;
+    }
     *optimization_type_decision =
         optimization_guide::OptimizationTypeDecision::kNoHintAvailable;
     return;
@@ -794,16 +796,18 @@ void OptimizationGuideHintsManager::CanApplyOptimization(
         matched_page_hint->max_ect_trigger());
   }
 
-  if (current_effective_connection_type_ ==
-          net::EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_UNKNOWN ||
-      current_effective_connection_type_ > max_ect_trigger) {
-    // The current network is not slow enough, so this navigation is likely not
-    // going to be painful.
-    *optimization_target_decision =
-        optimization_guide::OptimizationTargetDecision::kPageLoadDoesNotMatch;
-  } else {
-    *optimization_target_decision =
-        optimization_guide::OptimizationTargetDecision::kPageLoadMatches;
+  if (should_update_optimization_target_decision) {
+    if (current_effective_connection_type_ ==
+            net::EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_UNKNOWN ||
+        current_effective_connection_type_ > max_ect_trigger) {
+      // The current network is not slow enough, so this navigation is likely
+      // not going to be painful.
+      *optimization_target_decision =
+          optimization_guide::OptimizationTargetDecision::kPageLoadDoesNotMatch;
+    } else {
+      *optimization_target_decision =
+          optimization_guide::OptimizationTargetDecision::kPageLoadMatches;
+    }
   }
 
   // Check if the URL should be filtered out if we have an optimization filter

chrome/browser/optimization_guide/optimization_guide_hints_manager_unittest.cc

@@ -1592,21 +1592,22 @@ TEST_F(OptimizationGuideHintsManagerTest,
       optimization_guide::proto::OPTIMIZATION_TARGET_UNKNOWN,
       optimization_guide::proto::NOSCRIPT, &optimization_target_decision,
       &optimization_type_decision, &optimization_metadata);
-  // Make sure metadata is cleared.
-  EXPECT_EQ(0, optimization_metadata.previews_metadata.inflation_percent());
+  // Make sure metadata is populated.
+  EXPECT_EQ(1234, optimization_metadata.previews_metadata.inflation_percent());
 
   // Make sure decisions are logged correctly.
-  EXPECT_EQ(optimization_guide::OptimizationTargetDecision::kUnknown,
+  EXPECT_EQ(optimization_guide::OptimizationTargetDecision::
+                kModelNotAvailableOnClient,
             optimization_target_decision);
-  EXPECT_EQ(optimization_guide::OptimizationTypeDecision::kUnknown,
+  EXPECT_EQ(optimization_guide::OptimizationTypeDecision::kAllowedByHint,
             optimization_type_decision);
   // Make sure navigation data is populated correctly.
   OptimizationGuideNavigationData* navigation_data =
       GetOptimizationGuideNavigationData(navigation_handle.get());
   EXPECT_TRUE(navigation_data->has_hint_before_commit().value());
-  EXPECT_EQ(base::nullopt, navigation_data->has_hint_after_commit());
-  EXPECT_EQ(base::nullopt, navigation_data->serialized_hint_version_string());
-  EXPECT_FALSE(navigation_data->has_page_hint_value());
+  EXPECT_TRUE(navigation_data->has_hint_after_commit().value());
+  EXPECT_EQ("someversion", navigation_data->serialized_hint_version_string());
+  EXPECT_TRUE(navigation_data->has_page_hint_value());
 }
 
 TEST_F(OptimizationGuideHintsManagerTest,