precache: Allow experiment bitsets of any size.

components/precache/core/precache_fetcher_unittest.cc

 // Copyright 2013 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/precache/core/precache_fetcher.h"
 
 #include <stdint.h>
 
 #include <cstring>
 #include <memory>
@@ skipping 558 matching lines @@
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
 
   EXPECT_TRUE(precache_delegate_.was_on_done_called());
 
   histogram.ExpectUniqueSample("Precache.Fetch.PercentCompleted", 100, 1);
   histogram.ExpectUniqueSample("Precache.Fetch.ResponseBytes.Total",
                                url_callback_.total_response_bytes(), 1);
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
 }
 
-TEST_F(PrecacheFetcherTest, PrecacheResourceSelection) {
+class PrecacheFetcherResourceSelectionTest
+    : public PrecacheFetcherTest,
+      public testing::WithParamInterface<PrecacheResourceSelection> {
+ public:
+  // Set bits for kGoodResourceURL, kGoodResourceURLB and kGoodResourceURLD.
+  static PrecacheResourceSelection DeprecatedBitset() {
+    PrecacheResourceSelection ret;
+    ret.set_deprecated_bitset(0b10101);

[jamartin, 2017/02/22 22:14:01]

Can you please change the testcase for one that it is not symmetric?

Maybe 0b10011?

It is indeed not symmetric in the new bitset, but still I'd like it to be
explicit in both selections.

[twifkak, 2017/02/22 23:55:03]

Done. Made it multibyte, too, to test the mixed ordering.

+    return ret;
+  }
+
+  // Set bits for kGoodResourceURL, kGoodResourceURLB and kGoodResourceURLD.
+  static PrecacheResourceSelection Bitset() {
+    PrecacheResourceSelection ret;
+    ret.set_bitset("\x15");
+    return ret;
+  }
+};
+
+TEST_P(PrecacheFetcherResourceSelectionTest, Basic) {
   SetDefaultFlags();
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
       new PrecacheUnfinishedWork());
   unfinished_work->add_top_host()->set_hostname("good-manifest.com");
   unfinished_work->set_start_time(base::Time::UnixEpoch().ToInternalValue());
 
   PrecacheConfigurationSettings config;
 
   PrecacheManifest good_manifest;
   PrecacheResourceSelection resource_selection;
   good_manifest.add_resource()->set_url(kGoodResourceURL);
   good_manifest.add_resource()->set_url(kGoodResourceURLA);
   good_manifest.add_resource()->set_url(kGoodResourceURLB);
   good_manifest.add_resource()->set_url(kGoodResourceURLC);
   good_manifest.add_resource()->set_url(kGoodResourceURLD);
 
-  // Set bits for kGoodResourceURL, kGoodResourceURLB and kGoodResourceURLD.
-  resource_selection.set_bitset(0b10101);
   (*good_manifest.mutable_experiments()
-        ->mutable_resources_by_experiment_group())[kExperimentID] =
-      resource_selection;
+        ->mutable_resources_by_experiment_group())[kExperimentID] = GetParam();
 
   factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(),
                            net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(GURL(kGoodManifestURL),
                            good_manifest.SerializeAsString(), net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(GURL(kGoodResourceURL), "good", net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(GURL(kGoodResourceURLB), "good URL B", net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
@@ skipping 24 matching lines @@
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
 
   EXPECT_TRUE(precache_delegate_.was_on_done_called());
 
   histogram.ExpectUniqueSample("Precache.Fetch.PercentCompleted", 100, 1);
   histogram.ExpectUniqueSample("Precache.Fetch.ResponseBytes.Total",
                                url_callback_.total_response_bytes(), 1);
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
 }
 
-TEST_F(PrecacheFetcherTest, PrecacheResourceSelectionMissingBitset) {
+TEST_P(PrecacheFetcherResourceSelectionTest, MissingBitset) {
   SetDefaultFlags();
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
       new PrecacheUnfinishedWork());
   unfinished_work->add_top_host()->set_hostname("good-manifest.com");
   unfinished_work->set_start_time(base::Time::UnixEpoch().ToInternalValue());
 
   PrecacheConfigurationSettings config;
 
   PrecacheManifest good_manifest;
   PrecacheResourceSelection resource_selection;
   good_manifest.add_resource()->set_url(kGoodResourceURL);
   good_manifest.add_resource()->set_url(kGoodResourceURLA);
   good_manifest.add_resource()->set_url(kGoodResourceURLB);
   good_manifest.add_resource()->set_url(kGoodResourceURLC);
   good_manifest.add_resource()->set_url(kGoodResourceURLD);
 
   // Set bits for a different experiment group.
-  resource_selection.set_bitset(0b1);
   (*good_manifest.mutable_experiments()
         ->mutable_resources_by_experiment_group())[kExperimentID + 1] =
-      resource_selection;
+      GetParam();
 
   // Resource selection bitset for the experiment group will be missing and all
   // resources will be fetched.
   factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(),
                            net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(GURL(kGoodManifestURL),
                            good_manifest.SerializeAsString(), net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(GURL(kGoodResourceURL), "good", net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
@@ skipping 32 matching lines @@
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
 
   EXPECT_TRUE(precache_delegate_.was_on_done_called());
 
   histogram.ExpectUniqueSample("Precache.Fetch.PercentCompleted", 100, 1);
   histogram.ExpectUniqueSample("Precache.Fetch.ResponseBytes.Total",
                                url_callback_.total_response_bytes(), 1);
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
 }
 
+INSTANTIATE_TEST_CASE_P(
+    PrecacheFetcherResourceSelectionTest,
+    PrecacheFetcherResourceSelectionTest,
+    testing::Values(PrecacheFetcherResourceSelectionTest::DeprecatedBitset(),
+                    PrecacheFetcherResourceSelectionTest::Bitset()));
+
 TEST_F(PrecacheFetcherTest, PrecachePauseResume) {
   SetDefaultFlags();
 
   PrecacheConfigurationSettings config;
   config.set_top_sites_count(3);
 
   std::unique_ptr<PrecacheUnfinishedWork> initial_work(
       new PrecacheUnfinishedWork());
   initial_work->add_top_host()->set_hostname("manifest1.com");
   initial_work->add_top_host()->set_hostname("manifest2.com");
@@ skipping 1206 matching lines @@
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
 
   EXPECT_TRUE(precache_delegate_.was_on_done_called());
 
   histogram.ExpectTotalCount("Precache.Fetch.PercentCompleted", 2);
   histogram.ExpectTotalCount("Precache.Fetch.ResponseBytes.Total", 2);
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 2);
 }
 
 }  // namespace precache