Resource loading hints browsertests for experimental hints

Add few browser tests that create component info with
experimental and/or default loading hints. Then, load a webpage
to verify that the resources specified by experimental/default
hints are blocked based on the finch experiment settings.

Change-Id: Id2d20d6f696d8de88a8cf0ed65a319ed67e9a500
Bug: 900699
Reviewed-on: https://chromium-review.googlesource.com/c/1314135
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Reviewed-by: Doug Arnett <dougarnett@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605377}

chrome/browser/previews/resource_loading_hints/resource_loading_hints_browsertest.cc

@@ -134,7 +134,8 @@ class ResourceLoadingNoFeaturesBrowserTest : public InProcessBrowserTest {
     cmd->AppendSwitch("enable-spdy-proxy-auth");
   }
 
-  void SetResourceLoadingHints(const std::vector<std::string>& hints_sites) {
+  void SetDefaultOnlyResourceLoadingHints(
+      const std::vector<std::string>& hints_sites) {
     std::vector<std::string> resource_patterns;
     resource_patterns.push_back("foo.jpg");
     resource_patterns.push_back("png");
@@ -152,6 +153,51 @@ class ResourceLoadingNoFeaturesBrowserTest : public InProcessBrowserTest {
     base::RunLoop().RunUntilIdle();
   }
 
+  // Sets the resource loading hints in optimization guide service. The hints
+  // are set as experimental.
+  void SetExperimentOnlyResourceLoadingHints(
+      const std::vector<std::string>& hints_sites) {
+    std::vector<std::string> resource_patterns;
+    resource_patterns.push_back("foo.jpg");
+    resource_patterns.push_back("png");
+    resource_patterns.push_back("woff2");
+
+    const optimization_guide::ComponentInfo& component_info =
+        test_component_creator_.CreateComponentInfoWithExperimentalPageHints(
+            optimization_guide::proto::RESOURCE_LOADING, hints_sites,
+            resource_patterns);
+
+    g_browser_process->optimization_guide_service()->ProcessHints(
+        component_info);
+
+    // Wait for hints to be processed by PreviewsOptimizationGuide.
+    base::RunLoop().RunUntilIdle();
+  }
+
+  // Sets the resource loading hints in optimization guide service. Some hints
+  // are set as experimental, while others are set as default.
+  void SetMixResourceLoadingHints(const std::vector<std::string>& hints_sites) {
+    std::vector<std::string> experimental_resource_patterns;
+    experimental_resource_patterns.push_back("foo.jpg");
+    experimental_resource_patterns.push_back("png");
+    experimental_resource_patterns.push_back("woff2");
+
+    std::vector<std::string> default_resource_patterns;
+    default_resource_patterns.push_back("bar.jpg");
+    default_resource_patterns.push_back("woff2");
+
+    const optimization_guide::ComponentInfo& component_info =
+        test_component_creator_.CreateComponentInfoWithMixPageHints(
+            optimization_guide::proto::RESOURCE_LOADING, hints_sites,
+            experimental_resource_patterns, default_resource_patterns);
+
+    g_browser_process->optimization_guide_service()->ProcessHints(
+        component_info);
+
+    // Wait for hints to be processed by PreviewsOptimizationGuide.
+    base::RunLoop().RunUntilIdle();
+  }
+
   void AddTestOptimizationGuideServiceObserver(
       TestOptimizationGuideServiceObserver* observer) {
     g_browser_process->optimization_guide_service()->AddObserver(observer);
@@ -282,34 +328,15 @@ class ResourceLoadingHintsBrowserTest
 // Previews InfoBar (which these tests triggers) does not work on Mac.
 // See https://crbug.com/782322 for details. Also occasional flakes on win7
 // (https://crbug.com/789542).
-// Additionally, ResourceLoadingHintsHttpsWhitelistedRedirectToHttps is disabled
-// on all OS types until hints are made to work with redirects.
-// TODO(jegray): Re-enable ResourceLoadingHintsHttpsWhitelistedRedirectToHttps
-// when support for redirects is added: https://crbug.com/891752
-#if !defined(OS_MACOSX) && !defined(OS_WIN)
-#define MAYBE_ResourceLoadingHintsHttpsWhitelisted \
-  ResourceLoadingHintsHttpsWhitelisted
-#define MAYBE_ResourceLoadingHintsHttpsWhitelistedRedirectToHttps \
-  DISABLED_ResourceLoadingHintsHttpsWhitelistedRedirectToHttps
-#define MAYBE_ResourceLoadingHintsHttpsNoWhitelisted \
-  ResourceLoadingHintsHttpsNoWhitelisted
-#define MAYBE_ResourceLoadingHintsHttp ResourceLoadingHintsHttp
-#define MAYBE_ResourceLoadingHintsHttpsWhitelistedNoTransform \
-  ResourceLoadingHintsHttpsWhitelistedNoTransform
+#if defined(OS_WIN) || defined(OS_MACOSX)
+#define DISABLE_ON_WIN_MAC(x) DISABLED_##x
 #else
-#define MAYBE_ResourceLoadingHintsHttpsWhitelisted \
-  DISABLED_ResourceLoadingHintsHttpsWhitelisted
-#define MAYBE_ResourceLoadingHintsHttpsWhitelistedRedirectToHttps \
-  DISABLED_ResourceLoadingHintsHttpsWhitelistedRedirectToHttps
-#define MAYBE_ResourceLoadingHintsHttpsNoWhitelisted \
-  DISABLED_ResourceLoadingHintsHttpsNoWhitelisted
-#define MAYBE_ResourceLoadingHintsHttp DISABLED_ResourceLoadingHintsHttp
-#define MAYBE_ResourceLoadingHintsHttpsWhitelistedNoTransform \
-  DISABLED_ResourceLoadingHintsHttpsWhitelistedNoTransform
+#define DISABLE_ON_WIN_MAC(x) x
 #endif
 
-IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
-                       MAYBE_ResourceLoadingHintsHttpsWhitelisted) {
+IN_PROC_BROWSER_TEST_F(
+    ResourceLoadingHintsBrowserTest,
+    DISABLE_ON_WIN_MAC(ResourceLoadingHintsHttpsWhitelisted)) {
   SetExpectedFooJpgRequest(false);
   SetExpectedBarJpgRequest(true);
 
@@ -318,7 +345,7 @@ IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
   base::RunLoop().RunUntilIdle();
 
   // Whitelist test URL for resource loading hints.
-  SetResourceLoadingHints({https_url().host()});
+  SetDefaultOnlyResourceLoadingHints({https_url().host()});
   observer.WaitForNotification();
 
   base::HistogramTester histogram_tester;
@@ -335,7 +362,7 @@ IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
       static_cast<int>(previews::PreviewsEligibilityReason::ALLOWED), 1);
   histogram_tester.ExpectBucketCount(
       "Previews.InfoBarAction.ResourceLoadingHints", 0, 1);
-  // SetResourceLoadingHints sets 3 resource loading hints patterns.
+  // SetDefaultOnlyResourceLoadingHints sets 3 resource loading hints patterns.
   histogram_tester.ExpectBucketCount(
       "ResourceLoadingHints.CountBlockedSubresourcePatterns", 3, 1);
   EXPECT_TRUE(resource_loading_hint_intervention_header_seen());
@@ -358,15 +385,95 @@ IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
       static_cast<int>(previews::PreviewsEligibilityReason::ALLOWED), 2);
   histogram_tester.ExpectBucketCount(
       "Previews.InfoBarAction.ResourceLoadingHints", 0, 2);
-  // SetResourceLoadingHints sets 3 resource loading hints patterns.
+  // SetDefaultOnlyResourceLoadingHints sets 3 resource loading hints patterns.
   histogram_tester.ExpectBucketCount(
       "ResourceLoadingHints.CountBlockedSubresourcePatterns", 3, 2);
   EXPECT_TRUE(resource_loading_hint_intervention_header_seen());
 }
 
+// Sets only the experimental hints, but does not enable the matching
+// experiment. Verifies that the hints are not used, and the resource loading is
+// not blocked.
+IN_PROC_BROWSER_TEST_F(
+    ResourceLoadingHintsBrowserTest,
+    DISABLE_ON_WIN_MAC(ExperimentalHints_ExperimentIsNotEnabled)) {
+  SetExpectedFooJpgRequest(true);
+  SetExpectedBarJpgRequest(true);
+
+  TestOptimizationGuideServiceObserver observer;
+  AddTestOptimizationGuideServiceObserver(&observer);
+  base::RunLoop().RunUntilIdle();
+
+  // Whitelist test URL for resource loading hints.
+  SetExperimentOnlyResourceLoadingHints({https_url().host()});
+  observer.WaitForNotification();
+
+  base::HistogramTester histogram_tester;
+
+  ui_test_utils::NavigateToURL(browser(), https_url());
+
+  histogram_tester.ExpectBucketCount(
+      "Previews.EligibilityReason.ResourceLoadingHints",
+      static_cast<int>(previews::PreviewsEligibilityReason::ALLOWED), 1);
+  histogram_tester.ExpectTotalCount(
+      "Previews.InfoBarAction.ResourceLoadingHints", 0);
+  histogram_tester.ExpectTotalCount(
+      "ResourceLoadingHints.CountBlockedSubresourcePatterns", 0);
+  EXPECT_FALSE(resource_loading_hint_intervention_header_seen());
+}
+
+// Sets only the experimental hints, and enables the matching experiment.
+// Verifies that the hints are used, and the resource loading is blocked.
+IN_PROC_BROWSER_TEST_F(
+    ResourceLoadingHintsBrowserTest,
+    DISABLE_ON_WIN_MAC(ExperimentalHints_ExperimentIsEnabled)) {
+  base::test::ScopedFeatureList scoped_list;
+  scoped_list.InitAndEnableFeatureWithParameters(
+      previews::features::kOptimizationHintsExperiments,
+      {{previews::features::kOptimizationHintsExperimentNameParam,
+        optimization_guide::testing::kFooExperimentName}});
+  SetExpectedFooJpgRequest(false);
+  SetExpectedBarJpgRequest(true);
+
+  TestOptimizationGuideServiceObserver observer;
+  AddTestOptimizationGuideServiceObserver(&observer);
+  base::RunLoop().RunUntilIdle();
+
+  // Whitelist test URL for resource loading hints.
+  SetExperimentOnlyResourceLoadingHints({https_url().host()});
+  observer.WaitForNotification();
+
+  base::HistogramTester histogram_tester;
+
+  ui_test_utils::NavigateToURL(browser(), https_url());
+
+  RetryForHistogramUntilCountReached(
+      &histogram_tester, "ResourceLoadingHints.CountBlockedSubresourcePatterns",
+      1);
+  histogram_tester.ExpectUniqueSample(
+      "ResourceLoadingHints.ResourcePatternsAvailableAtCommit", 1, 1);
+  histogram_tester.ExpectBucketCount(
+      "Previews.EligibilityReason.ResourceLoadingHints",
+      static_cast<int>(previews::PreviewsEligibilityReason::ALLOWED), 1);
+  histogram_tester.ExpectBucketCount(
+      "Previews.InfoBarAction.ResourceLoadingHints", 0, 1);
+  // SetDefaultOnlyResourceLoadingHints sets 3 resource loading hints patterns.
+  histogram_tester.ExpectBucketCount(
+      "ResourceLoadingHints.CountBlockedSubresourcePatterns", 3, 1);
+  EXPECT_TRUE(resource_loading_hint_intervention_header_seen());
+}
+
+// Sets both the experimental and default hints, and enables the matching
+// experiment. Verifies that the hints are used, and the resource loading is
+// blocked.
 IN_PROC_BROWSER_TEST_F(
     ResourceLoadingHintsBrowserTest,
-    MAYBE_ResourceLoadingHintsHttpsWhitelistedRedirectToHttps) {
+    DISABLE_ON_WIN_MAC(MixExperimentalHints_ExperimentIsEnabled)) {
+  base::test::ScopedFeatureList scoped_list;
+  scoped_list.InitAndEnableFeatureWithParameters(
+      previews::features::kOptimizationHintsExperiments,
+      {{previews::features::kOptimizationHintsExperimentNameParam,
+        optimization_guide::testing::kFooExperimentName}});
   SetExpectedFooJpgRequest(false);
   SetExpectedBarJpgRequest(true);
 
@@ -374,7 +481,84 @@ IN_PROC_BROWSER_TEST_F(
   AddTestOptimizationGuideServiceObserver(&observer);
   base::RunLoop().RunUntilIdle();
 
-  SetResourceLoadingHints({https_url().host()});
+  // Whitelist test URL for resource loading hints. Set both experimental and
+  // non-experimental hints.
+  SetMixResourceLoadingHints({https_url().host()});
+  observer.WaitForNotification();
+
+  base::HistogramTester histogram_tester;
+
+  ui_test_utils::NavigateToURL(browser(), https_url());
+
+  RetryForHistogramUntilCountReached(
+      &histogram_tester, "ResourceLoadingHints.CountBlockedSubresourcePatterns",
+      1);
+  histogram_tester.ExpectUniqueSample(
+      "ResourceLoadingHints.ResourcePatternsAvailableAtCommit", 1, 1);
+  histogram_tester.ExpectBucketCount(
+      "Previews.EligibilityReason.ResourceLoadingHints",
+      static_cast<int>(previews::PreviewsEligibilityReason::ALLOWED), 1);
+  histogram_tester.ExpectBucketCount(
+      "Previews.InfoBarAction.ResourceLoadingHints", 0, 1);
+  // SetDefaultOnlyResourceLoadingHints sets 3 resource loading hints patterns.
+  histogram_tester.ExpectBucketCount(
+      "ResourceLoadingHints.CountBlockedSubresourcePatterns", 3, 1);
+  EXPECT_TRUE(resource_loading_hint_intervention_header_seen());
+}
+
+// Sets both the experimental and default hints, but does not enable the
+// matching experiment. Verifies that the hints from the experiment are not
+// used.
+IN_PROC_BROWSER_TEST_F(
+    ResourceLoadingHintsBrowserTest,
+    DISABLE_ON_WIN_MAC(MixExperimentalHints_ExperimentIsNotEnabled)) {
+  base::test::ScopedFeatureList scoped_list;
+  scoped_list.InitAndEnableFeatureWithParameters(
+      previews::features::kOptimizationHintsExperiments,
+      {{previews::features::kOptimizationHintsExperimentNameParam,
+        "some_other_experiment"}});
+  SetExpectedFooJpgRequest(true);
+  SetExpectedBarJpgRequest(false);
+
+  TestOptimizationGuideServiceObserver observer;
+  AddTestOptimizationGuideServiceObserver(&observer);
+  base::RunLoop().RunUntilIdle();
+
+  // Whitelist test URL for resource loading hints.
+  SetMixResourceLoadingHints({https_url().host()});
+  observer.WaitForNotification();
+
+  base::HistogramTester histogram_tester;
+
+  ui_test_utils::NavigateToURL(browser(), https_url());
+
+  RetryForHistogramUntilCountReached(
+      &histogram_tester, "ResourceLoadingHints.CountBlockedSubresourcePatterns",
+      1);
+  histogram_tester.ExpectBucketCount(
+      "Previews.EligibilityReason.ResourceLoadingHints",
+      static_cast<int>(previews::PreviewsEligibilityReason::ALLOWED), 1);
+  // Infobar would still be shown since there were at least one resource
+  // loading hints available, even though none of them matched.
+  histogram_tester.ExpectTotalCount(
+      "Previews.InfoBarAction.ResourceLoadingHints", 1);
+  EXPECT_TRUE(resource_loading_hint_intervention_header_seen());
+}
+
+// Disabled on all OS types until hints are made to work with redirects.
+// TODO(jegray): https://crbug.com/891752. Re-enable when support for redirects
+// is added.
+IN_PROC_BROWSER_TEST_F(
+    ResourceLoadingHintsBrowserTest,
+    DISABLED_ResourceLoadingHintsHttpsWhitelistedRedirectToHttps) {
+  SetExpectedFooJpgRequest(false);
+  SetExpectedBarJpgRequest(true);
+
+  TestOptimizationGuideServiceObserver observer;
+  AddTestOptimizationGuideServiceObserver(&observer);
+  base::RunLoop().RunUntilIdle();
+
+  SetDefaultOnlyResourceLoadingHints({https_url().host()});
   observer.WaitForNotification();
 
   base::HistogramTester histogram_tester;
@@ -389,14 +573,15 @@ IN_PROC_BROWSER_TEST_F(
       static_cast<int>(previews::PreviewsEligibilityReason::ALLOWED), 1);
   histogram_tester.ExpectTotalCount(
       "Previews.InfoBarAction.ResourceLoadingHints", 1);
-  // SetResourceLoadingHints sets 3 resource loading hints patterns.
+  // SetDefaultOnlyResourceLoadingHints sets 3 resource loading hints patterns.
   histogram_tester.ExpectBucketCount(
       "ResourceLoadingHints.CountBlockedSubresourcePatterns", 3, 1);
   EXPECT_TRUE(resource_loading_hint_intervention_header_seen());
 }
 
-IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
-                       MAYBE_ResourceLoadingHintsHttpsNoWhitelisted) {
+IN_PROC_BROWSER_TEST_F(
+    ResourceLoadingHintsBrowserTest,
+    DISABLE_ON_WIN_MAC(ResourceLoadingHintsHttpsNoWhitelisted)) {
   SetExpectedFooJpgRequest(true);
   SetExpectedBarJpgRequest(true);
 
@@ -404,7 +589,7 @@ IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
   AddTestOptimizationGuideServiceObserver(&observer);
   base::RunLoop().RunUntilIdle();
 
-  SetResourceLoadingHints({});
+  SetDefaultOnlyResourceLoadingHints({});
   observer.WaitForNotification();
 
   base::HistogramTester histogram_tester;
@@ -426,7 +611,7 @@ IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
-                       MAYBE_ResourceLoadingHintsHttp) {
+                       DISABLE_ON_WIN_MAC(ResourceLoadingHintsHttp)) {
   SetExpectedFooJpgRequest(true);
   SetExpectedBarJpgRequest(true);
 
@@ -435,7 +620,7 @@ IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
   base::RunLoop().RunUntilIdle();
 
   // Whitelist test HTTP URL for resource loading hints.
-  SetResourceLoadingHints({https_url().host()});
+  SetDefaultOnlyResourceLoadingHints({https_url().host()});
   observer.WaitForNotification();
 
   base::HistogramTester histogram_tester;
@@ -453,8 +638,9 @@ IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
   EXPECT_FALSE(resource_loading_hint_intervention_header_seen());
 }
 
-IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
-                       MAYBE_ResourceLoadingHintsHttpsWhitelistedNoTransform) {
+IN_PROC_BROWSER_TEST_F(
+    ResourceLoadingHintsBrowserTest,
+    DISABLE_ON_WIN_MAC(ResourceLoadingHintsHttpsWhitelistedNoTransform)) {
   SetExpectedFooJpgRequest(true);
   SetExpectedBarJpgRequest(true);
 
@@ -463,7 +649,7 @@ IN_PROC_BROWSER_TEST_F(ResourceLoadingHintsBrowserTest,
   base::RunLoop().RunUntilIdle();
 
   // Whitelist test URL for resource loading hints.
-  SetResourceLoadingHints({https_url().host()});
+  SetDefaultOnlyResourceLoadingHints({https_url().host()});
   observer.WaitForNotification();
 
   base::HistogramTester histogram_tester;

components/optimization_guide/test_component_creator.cc

@@ -71,6 +71,86 @@ TestComponentCreator::CreateComponentInfoWithPageHints(
   return WriteConfigToFileAndReturnComponentInfo(config);
 }
 
+optimization_guide::ComponentInfo
+TestComponentCreator::CreateComponentInfoWithExperimentalPageHints(
+    optimization_guide::proto::OptimizationType optimization_type,
+    const std::vector<std::string>& page_hint_host_suffixes,
+    const std::vector<std::string>& experimental_resource_patterns) {
+  optimization_guide::proto::Configuration config;
+  for (const auto& page_hint_site : page_hint_host_suffixes) {
+    optimization_guide::proto::Hint* hint = config.add_hints();
+    hint->set_key(page_hint_site);
+    hint->set_key_representation(optimization_guide::proto::HOST_SUFFIX);
+
+    optimization_guide::proto::PageHint* page_hint = hint->add_page_hints();
+    page_hint->set_page_pattern("*");
+
+    optimization_guide::proto::Optimization* optimization =
+        page_hint->add_whitelisted_optimizations();
+    optimization->set_optimization_type(optimization_type);
+    optimization->set_experiment_name(kFooExperimentName);
+
+    for (auto resource_blocking_pattern : experimental_resource_patterns) {
+      optimization_guide::proto::ResourceLoadingHint* resource_loading_hint =
+          optimization->add_resource_loading_hints();
+      resource_loading_hint->set_loading_optimization_type(
+          optimization_guide::proto::LOADING_BLOCK_RESOURCE);
+      resource_loading_hint->set_resource_pattern(resource_blocking_pattern);
+    }
+  }
+
+  return WriteConfigToFileAndReturnComponentInfo(config);
+}
+
+optimization_guide::ComponentInfo
+TestComponentCreator::CreateComponentInfoWithMixPageHints(
+    optimization_guide::proto::OptimizationType optimization_type,
+    const std::vector<std::string>& page_hint_host_suffixes,
+    const std::vector<std::string>& experimental_resource_patterns,
+    const std::vector<std::string>& default_resource_patterns) {
+  optimization_guide::proto::Configuration config;
+  for (const auto& page_hint_site : page_hint_host_suffixes) {
+    optimization_guide::proto::Hint* hint = config.add_hints();
+    hint->set_key(page_hint_site);
+    hint->set_key_representation(optimization_guide::proto::HOST_SUFFIX);
+
+    optimization_guide::proto::PageHint* page_hint = hint->add_page_hints();
+    page_hint->set_page_pattern("*");
+
+    // Add experimental patterns first so they get higher priority.
+    {
+      optimization_guide::proto::Optimization* optimization =
+          page_hint->add_whitelisted_optimizations();
+      optimization->set_optimization_type(optimization_type);
+      optimization->set_experiment_name(kFooExperimentName);
+
+      for (auto resource_blocking_pattern : experimental_resource_patterns) {
+        optimization_guide::proto::ResourceLoadingHint* resource_loading_hint =
+            optimization->add_resource_loading_hints();
+        resource_loading_hint->set_loading_optimization_type(
+            optimization_guide::proto::LOADING_BLOCK_RESOURCE);
+        resource_loading_hint->set_resource_pattern(resource_blocking_pattern);
+      }
+    }
+
+    {
+      optimization_guide::proto::Optimization* optimization =
+          page_hint->add_whitelisted_optimizations();
+      optimization->set_optimization_type(optimization_type);
+
+      for (auto resource_blocking_pattern : default_resource_patterns) {
+        optimization_guide::proto::ResourceLoadingHint* resource_loading_hint =
+            optimization->add_resource_loading_hints();
+        resource_loading_hint->set_loading_optimization_type(
+            optimization_guide::proto::LOADING_BLOCK_RESOURCE);
+        resource_loading_hint->set_resource_pattern(resource_blocking_pattern);
+      }
+    }
+  }
+
+  return WriteConfigToFileAndReturnComponentInfo(config);
+}
+
 base::FilePath TestComponentCreator::GetFilePath(std::string file_path_suffix) {
   base::ScopedAllowBlockingForTesting allow_blocking;
   EXPECT_TRUE(scoped_temp_dir_->IsValid() ||

components/optimization_guide/test_component_creator.h

@@ -16,6 +16,9 @@
 namespace optimization_guide {
 namespace testing {
 
+// Experiment name used for experimental resource loading hints.
+static const char kFooExperimentName[] = "foo_experiment";
+
 // Helper class to create test OptimizationHints components for testing.
 //
 // All temporary files and paths are cleaned up when this instance goes out of
@@ -31,14 +34,42 @@ class TestComponentCreator {
   optimization_guide::ComponentInfo CreateComponentInfoWithTopLevelWhitelist(
       optimization_guide::proto::OptimizationType optimization_type,
       const std::vector<std::string>& whitelisted_host_suffixes);
+
   // Creates component data based on |whitelisted_host_suffixes| with page hints
   // for type |optimization_type| blocking resources specified by
-  // |resource_patterns|.and returns the ComponentInfo for it.
+  // |resource_patterns|, and returns the ComponentInfo for it.
   optimization_guide::ComponentInfo CreateComponentInfoWithPageHints(
       optimization_guide::proto::OptimizationType optimization_type,
       const std::vector<std::string>& whitelisted_host_suffixes,
       const std::vector<std::string>& resource_patterns);
 
+  // Creates component data based on |whitelisted_host_suffixes| with page hints
+  // for type |optimization_type| blocking resources specified by
+  // |experimental_resource_patterns|, and returns the ComponentInfo for it.
+  // The loading hints are set as experimental with experiment name set to
+  // kFooExperimentName.
+
+  // Creates component data for testing with experimental optimizations. It
+  // creates a PageHint (with page pattern "*" for each key in
+  // |whitelisted_host_suffixes| that each has resource blocking patterns from
+  // |experimental_resource_patterns|.
+  optimization_guide::ComponentInfo
+  CreateComponentInfoWithExperimentalPageHints(
+      optimization_guide::proto::OptimizationType optimization_type,
+      const std::vector<std::string>& whitelisted_host_suffixes,
+      const std::vector<std::string>& experimental_resource_patterns);
+
+  // Creates component data for testing with both default and experimental
+  // optimizations. It creates a PageHint (with page pattern "*" for each key in
+  // |whitelisted_host_suffixes| that each has resource blocking patterns from
+  // |default_resource_patterns| and |experimental_resource_patterns|. The
+  // experimental hints are guarded behind experiment kFooExperimentName.
+  optimization_guide::ComponentInfo CreateComponentInfoWithMixPageHints(
+      optimization_guide::proto::OptimizationType optimization_type,
+      const std::vector<std::string>& whitelisted_host_suffixes,
+      const std::vector<std::string>& experimental_resource_patterns,
+      const std::vector<std::string>& default_resource_patterns);
+
  private:
   // Returns the scoped temp directory path with the |file_path_suffix| that is
   // valid for the lifetime of this instance.