precache: Extract common methods for PrecacheManifest into util.

components/precache/core/precache_fetcher.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 <algorithm>
 #include <limits>
 #include <set>
 #include <utility>
@@ skipping 10 matching lines @@
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/optional.h"
 #include "base/sha1.h"
 #include "base/strings/string_piece.h"
 #include "base/task_runner_util.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/precache/core/precache_database.h"
+#include "components/precache/core/precache_manifest_util.h"
 #include "components/precache/core/precache_switches.h"
 #include "components/precache/core/proto/quota.pb.h"
 #include "components/precache/core/proto/unfinished_work.pb.h"
 #include "net/base/completion_callback.h"
 #include "net/base/escape.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/url_util.h"
 #include "net/http/http_response_headers.h"
@@ skipping 77 matching lines @@
     return false;
   }
   if (!message->ParseFromString(response_string)) {
     DLOG(WARNING) << "Unable to parse proto served from "
                   << source.GetOriginalURL().spec();
     return false;
   }
   return true;
 }
 
-// Returns the resource selection bitset from the |manifest| for the given
-// |experiment_id|. If the experiment group is not found, then this returns
-// nullopt, in which case all resources should be selected.
-base::Optional<std::vector<bool>> GetResourceBitset(
-    const PrecacheManifest& manifest,
-    uint32_t experiment_id) {
-  base::Optional<std::vector<bool>> ret;
-  if (manifest.has_experiments()) {
-    const auto& resource_bitset_map =
-        manifest.experiments().resources_by_experiment_group();
-    const auto& it = resource_bitset_map.find(experiment_id);
-    if (it != resource_bitset_map.end()) {
-      if (it->second.has_bitset()) {
-        const std::string& bitset = it->second.bitset();
-        ret.emplace(bitset.size() * 8);
-        for (size_t i = 0; i < bitset.size(); ++i) {
-          for (size_t j = 0; j < 8; ++j) {
-            if ((1 << j) & bitset[i])
-              ret.value()[i * 8 + j] = true;
-          }
-        }
-      } else if (it->second.has_deprecated_bitset()) {
-        uint64_t bitset = it->second.deprecated_bitset();
-        ret.emplace(64);
-        for (int i = 0; i < 64; ++i) {
-          if ((0x1ULL << i) & bitset)
-            ret.value()[i] = true;
-        }
-      }
-    }
-  }
-  // Only return one variable to ensure RVO triggers.
-  return ret;
-}
-
 // URLFetcherResponseWriter that ignores the response body, in order to avoid
 // the unnecessary memory usage. Use it rather than the default if you don't
 // care about parsing the response body. We use it below as a means to populate
 // the cache with requested resource URLs.
 class URLFetcherNullWriter : public net::URLFetcherResponseWriter {
  public:
   int Initialize(const net::CompletionCallback& callback) override {
     return net::OK;
   }
 
@@ skipping 824 matching lines @@
       remaining = 0;
     quota_.set_remaining(
         used_bytes > quota_.remaining() ? 0U : quota_.remaining() - used_bytes);
     db_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&PrecacheDatabase::SaveQuota, precache_database_, quota_));
   }
 }
 
 }  // namespace precache