Centralize loaded hint local histogram to optimization_guide

This makes it easier to join the browser tests to test both the original
and OptimizationGuideKeyedService code paths

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

chrome/browser/optimization_guide/optimization_guide_hints_manager.cc

@@ -22,6 +22,7 @@
 #include "components/optimization_guide/hints_fetcher.h"
 #include "components/optimization_guide/hints_processing_util.h"
 #include "components/optimization_guide/optimization_filter.h"
+#include "components/optimization_guide/optimization_guide_constants.h"
 #include "components/optimization_guide/optimization_guide_features.h"
 #include "components/optimization_guide/optimization_guide_prefs.h"
 #include "components/optimization_guide/optimization_guide_service.h"
@@ -477,7 +478,8 @@ void OptimizationGuideHintsManager::OnHintLoaded(
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Record the result of loading a hint. This is used as a signal for testing.
-  LOCAL_HISTOGRAM_BOOLEAN("OptimizationGuide.LoadedHint.Result", loaded_hint);
+  LOCAL_HISTOGRAM_BOOLEAN(optimization_guide::kLoadedHintLocalHistogramString,
+                          loaded_hint);
 
   // Run the callback now that the hint is loaded. This is used as a signal by
   // tests.

chrome/browser/previews/defer_all_script_browsertest.cc

@@ -24,6 +24,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_features.h"
 #include "components/optimization_guide/hints_component_info.h"
+#include "components/optimization_guide/optimization_guide_constants.h"
 #include "components/optimization_guide/optimization_guide_features.h"
 #include "components/optimization_guide/optimization_guide_service.h"
 #include "components/optimization_guide/proto/hints.pb.h"
@@ -31,7 +32,6 @@
 #include "components/previews/content/previews_hints.h"
 #include "components/previews/content/previews_optimization_guide.h"
 #include "components/previews/content/previews_ui_service.h"
-#include "components/previews/core/previews_constants.h"
 #include "components/previews/core/previews_features.h"
 #include "components/previews/core/previews_switches.h"
 #include "components/ukm/test_ukm_recorder.h"
@@ -146,8 +146,7 @@ class DeferAllScriptBrowserTest : public InProcessBrowserTest {
     ui_test_utils::NavigateToURL(browser(), url);
 
     RetryForHistogramUntilCountReached(
-        &histogram_tester,
-        previews::kPreviewsOptimizationGuideOnLoadedHintResultHistogramString,
+        &histogram_tester, optimization_guide::kLoadedHintLocalHistogramString,
         1);
   }
 

chrome/browser/previews/defer_all_script_priority_browsertest.cc

@@ -24,6 +24,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_features.h"
 #include "components/optimization_guide/hints_component_info.h"
+#include "components/optimization_guide/optimization_guide_constants.h"
 #include "components/optimization_guide/optimization_guide_features.h"
 #include "components/optimization_guide/optimization_guide_service.h"
 #include "components/optimization_guide/proto/hints.pb.h"
@@ -31,7 +32,6 @@
 #include "components/previews/content/previews_hints.h"
 #include "components/previews/content/previews_optimization_guide.h"
 #include "components/previews/content/previews_ui_service.h"
-#include "components/previews/core/previews_constants.h"
 #include "components/previews/core/previews_features.h"
 #include "components/previews/core/previews_switches.h"
 #include "content/public/test/browser_test.h"
@@ -225,8 +225,7 @@ class DeferAllScriptPriorityBrowserTest
     ui_test_utils::NavigateToURL(browser(), url);
 
     RetryForHistogramUntilCountReached(
-        &histogram_tester,
-        previews::kPreviewsOptimizationGuideOnLoadedHintResultHistogramString,
+        &histogram_tester, optimization_guide::kLoadedHintLocalHistogramString,
         1);
   }
 

chrome/browser/previews/hints_fetcher_browsertest.cc

@@ -25,6 +25,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_features.h"
 #include "components/optimization_guide/hints_component_info.h"
+#include "components/optimization_guide/optimization_guide_constants.h"
 #include "components/optimization_guide/optimization_guide_features.h"
 #include "components/optimization_guide/optimization_guide_prefs.h"
 #include "components/optimization_guide/optimization_guide_service.h"
@@ -35,7 +36,6 @@
 #include "components/previews/content/previews_optimization_guide.h"
 #include "components/previews/content/previews_ui_service.h"
 #include "components/previews/core/previews_black_list.h"
-#include "components/previews/core/previews_constants.h"
 #include "components/previews/core/previews_features.h"
 #include "components/previews/core/previews_switches.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -217,8 +217,7 @@ class HintsFetcherDisabledBrowserTest : public InProcessBrowserTest {
     ui_test_utils::NavigateToURL(browser(), url);
 
     RetryForHistogramUntilCountReached(
-        &histogram_tester,
-        previews::kPreviewsOptimizationGuideOnLoadedHintResultHistogramString,
+        &histogram_tester, optimization_guide::kLoadedHintLocalHistogramString,
         1);
   }
 

chrome/browser/previews/previews_browsertest.cc

@@ -23,6 +23,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_features.h"
 #include "components/optimization_guide/hints_component_info.h"
+#include "components/optimization_guide/optimization_guide_constants.h"
 #include "components/optimization_guide/optimization_guide_features.h"
 #include "components/optimization_guide/optimization_guide_service.h"
 #include "components/optimization_guide/proto/hints.pb.h"
@@ -30,7 +31,6 @@
 #include "components/previews/content/previews_decider_impl.h"
 #include "components/previews/content/previews_optimization_guide.h"
 #include "components/previews/content/previews_ui_service.h"
-#include "components/previews/core/previews_constants.h"
 #include "components/previews/core/previews_features.h"
 #include "components/previews/core/previews_switches.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -276,8 +276,7 @@ class PreviewsNoScriptBrowserTest : public PreviewsBrowserTest {
     ui_test_utils::NavigateToURL(browser(), hint_setup_url);
 
     RetryForHistogramUntilCountReached(
-        &histogram_tester,
-        previews::kPreviewsOptimizationGuideOnLoadedHintResultHistogramString,
+        &histogram_tester, optimization_guide::kLoadedHintLocalHistogramString,
         1);
   }
 

chrome/browser/previews/previews_lite_page_browsertest.cc

@@ -68,7 +68,6 @@
 #include "components/previews/content/previews_optimization_guide.h"
 #include "components/previews/content/previews_ui_service.h"
 #include "components/previews/content/previews_user_data.h"
-#include "components/previews/core/previews_constants.h"
 #include "components/previews/core/previews_experiments.h"
 #include "components/previews/core/previews_features.h"
 #include "components/previews/core/previews_lite_page_redirect.h"

chrome/browser/previews/resource_loading_hints/resource_loading_hints_browsertest.cc

@@ -26,6 +26,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_features.h"
 #include "components/optimization_guide/hints_component_info.h"
+#include "components/optimization_guide/optimization_guide_constants.h"
 #include "components/optimization_guide/optimization_guide_features.h"
 #include "components/optimization_guide/optimization_guide_service.h"
 #include "components/optimization_guide/proto/hints.pb.h"
@@ -35,7 +36,6 @@
 #include "components/previews/content/previews_optimization_guide.h"
 #include "components/previews/content/previews_ui_service.h"
 #include "components/previews/core/previews_black_list.h"
-#include "components/previews/core/previews_constants.h"
 #include "components/previews/core/previews_features.h"
 #include "components/previews/core/previews_switches.h"
 #include "components/ukm/test_ukm_recorder.h"
@@ -215,8 +215,7 @@ class ResourceLoadingNoFeaturesBrowserTest : public InProcessBrowserTest {
     ui_test_utils::NavigateToURL(browser(), url);
 
     RetryForHistogramUntilCountReached(
-        &histogram_tester,
-        previews::kPreviewsOptimizationGuideOnLoadedHintResultHistogramString,
+        &histogram_tester, optimization_guide::kLoadedHintLocalHistogramString,
         1);
   }
 

components/optimization_guide/optimization_guide_constants.cc

@@ -14,4 +14,7 @@ const char kRulesetFormatVersionString[] = "1.0.0";
 const char kOptimizationGuideServiceDefaultURL[] =
     "https://optimizationguide-pa.googleapis.com/v1:GetHints";
 
+const char kLoadedHintLocalHistogramString[] =
+    "OptimizationGuide.LoadedHint.Result";
+
 }  // namespace optimization_guide

components/optimization_guide/optimization_guide_constants.h

@@ -17,6 +17,10 @@ extern const char kRulesetFormatVersionString[];
 // The remote Optimization Guide Service production server to fetch hints from.
 extern const char kOptimizationGuideServiceDefaultURL[];
 
+// The local histogram used to record that the component hints are stored in
+// the cache and are ready for use.
+extern const char kLoadedHintLocalHistogramString[];
+
 }  // namespace optimization_guide
 
 #endif  // COMPONENTS_OPTIMIZATION_GUIDE_OPTIMIZATION_GUIDE_CONSTANTS_H_

components/previews/content/previews_optimization_guide.cc

@@ -18,6 +18,7 @@
 #include "components/optimization_guide/hints_component_info.h"
 #include "components/optimization_guide/hints_component_util.h"
 #include "components/optimization_guide/hints_fetcher.h"
+#include "components/optimization_guide/optimization_guide_constants.h"
 #include "components/optimization_guide/optimization_guide_features.h"
 #include "components/optimization_guide/optimization_guide_prefs.h"
 #include "components/optimization_guide/optimization_guide_service.h"
@@ -27,7 +28,6 @@
 #include "components/prefs/pref_service.h"
 #include "components/previews/content/previews_hints.h"
 #include "components/previews/content/previews_user_data.h"
-#include "components/previews/core/previews_constants.h"
 #include "components/previews/core/previews_switches.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "url/gurl.h"
@@ -154,8 +154,8 @@ void PreviewsOptimizationGuide::OnLoadedHint(
 
   // Record that the hint finished loading. This is used as a signal during
   // tests.
-  LOCAL_HISTOGRAM_BOOLEAN(
-      kPreviewsOptimizationGuideOnLoadedHintResultHistogramString, loaded_hint);
+  LOCAL_HISTOGRAM_BOOLEAN(optimization_guide::kLoadedHintLocalHistogramString,
+                          loaded_hint);
 
   // Run the callback now that the hint is loaded. This is used as a signal by
   // tests.

components/previews/core/BUILD.gn

@@ -6,8 +6,6 @@ static_library("core") {
   sources = [
     "previews_black_list.cc",
     "previews_black_list.h",
-    "previews_constants.cc",
-    "previews_constants.h",
     "previews_decider.h",
     "previews_experiments.cc",
     "previews_experiments.h",

components/previews/core/previews_constants.cc

-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/previews/core/previews_constants.h"
-
-namespace previews {
-
-const char kPreviewsOptimizationGuideOnLoadedHintResultHistogramString[] =
-    "PreviewsOptimizationGuide.OnLoadedHint.Result";
-
-}  // namespace previews

components/previews/core/previews_constants.h

-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_PREVIEWS_CORE_PREVIEWS_CONSTANTS_H_
-#define COMPONENTS_PREVIEWS_CORE_PREVIEWS_CONSTANTS_H_
-
-namespace previews {
-
-// The local histogram used by PreviewsOptimizationGuide to record that a hint
-// finished loading.
-extern const char kPreviewsOptimizationGuideOnLoadedHintResultHistogramString[];
-
-}  // namespace previews
-
-#endif  // COMPONENTS_PREVIEWS_CORE_PREVIEWS_CONSTANTS_H_

components/previews/core/previews_experiments.cc

@@ -13,7 +13,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
-#include "components/previews/core/previews_constants.h"
 #include "components/previews/core/previews_features.h"
 #include "components/previews/core/previews_switches.h"
 #include "net/base/url_util.h"

components/previews/core/previews_experiments_unittest.cc

@@ -15,7 +15,6 @@
 #include "base/strings/string_util.h"
 #include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
-#include "components/previews/core/previews_constants.h"
 #include "components/previews/core/previews_features.h"
 #include "components/variations/variations_associated_data.h"