Factor Chrome details out of update manifest fetching.

extensions/browser/updater/manifest_fetch_data.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/updater/manifest_fetch_data.h"
+#include "extensions/browser/updater/manifest_fetch_data.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/google/google_brand.h"
-#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
-#include "components/omaha_query_params/omaha_query_params.h"
+#include "base/strings/stringprintf.h"
 #include "net/base/escape.h"
 
 namespace {
 
 // Maximum length of an extension manifest update check url, since it is a GET
 // request. We want to stay under 2K because of proxies, etc.
 const int kExtensionsManifestMaxURLSize = 2000;
 
 }  // namespace
 
 namespace extensions {
 
-ManifestFetchData::ManifestFetchData(const GURL& update_url, int request_id)
+ManifestFetchData::ManifestFetchData(const GURL& update_url,
+                                     int request_id,
+                                     const std::string& brand_code,
+                                     const std::string& base_query_params,
+                                     PingMode ping_mode)
     : base_url_(update_url),
-      full_url_(update_url) {
-  std::string query = full_url_.has_query() ?
-      full_url_.query() + "&" : std::string();
-  query += omaha_query_params::OmahaQueryParams::Get(
-      omaha_query_params::OmahaQueryParams::CRX);
+      full_url_(update_url),
+      brand_code_(brand_code),
+      ping_mode_(ping_mode) {
+  std::string query =
+      full_url_.has_query() ? full_url_.query() + "&" : std::string();
+  query += base_query_params;
   GURL::Replacements replacements;
   replacements.SetQueryStr(query);
   full_url_ = full_url_.ReplaceComponents(replacements);
 
   request_ids_.insert(request_id);
 }
 
-ManifestFetchData::~ManifestFetchData() {}
+ManifestFetchData::~ManifestFetchData() {
+}
 
 // The format for request parameters in update checks is:
 //
 //   ?x=EXT1_INFO&x=EXT2_INFO
 //
 // where EXT1_INFO and EXT2_INFO are url-encoded strings of the form:
 //
 //   id=EXTENSION_ID&v=VERSION&uc
 //
-// Additionally, we may include the parameter ping=PING_DATA where PING_DATA
+// Provide ping data with the parameter ping=PING_DATA where PING_DATA
 // looks like r=DAYS or a=DAYS for extensions in the Chrome extensions gallery.
 // ('r' refers to 'roll call' ie installation, and 'a' refers to 'active').
 // These values will each be present at most once every 24 hours, and indicate
 // the number of days since the last time it was present in an update check.
 //
 // So for two extensions like:
 //   Extension 1- id:aaaa version:1.1
 //   Extension 2- id:bbbb version:2.0
 //
 // the full update url would be:
@@ skipping 19 matching lines @@
   parts.push_back("uc");
 
   if (!update_url_data.empty()) {
     // Make sure the update_url_data string is escaped before using it so that
     // there is no chance of overriding the id or v other parameter value
     // we place into the x= value.
     parts.push_back("ap=" + net::EscapeQueryParamValue(update_url_data, true));
   }
 
   // Append brand code, rollcall and active ping parameters.
-  if (base_url_.DomainIs("google.com")) {
-#if defined(GOOGLE_CHROME_BUILD)
-    std::string brand;
-    google_brand::GetBrand(&brand);
-    if (!brand.empty() && !google_brand::IsOrganic(brand))
-      parts.push_back("brand=" + brand);
-#endif
+  if (ping_mode_ >= PING) {

[not at google - send to devlin, 2014/08/13 01:30:02]

Since when did PingMode define an ordering? Either comment that there is, or
preferably use != NO_PING because that makes more sense to me.

+    if (!brand_code_.empty())
+      parts.push_back(base::StringPrintf("brand=%s", brand_code_.c_str()));
 
     std::string ping_value;
     pings_[id] = PingData(0, 0, false);
-
     if (ping_data) {
       if (ping_data->rollcall_days == kNeverPinged ||
           ping_data->rollcall_days > 0) {
         ping_value += "r=" + base::IntToString(ping_data->rollcall_days);
-        if (ChromeMetricsServiceAccessor::IsMetricsReportingEnabled()) {
+        if (ping_mode_ == PING_WITH_METRICS) {
           ping_value += "&e=" + std::string(ping_data->is_enabled ? "1" : "0");
         }
         pings_[id].rollcall_days = ping_data->rollcall_days;
         pings_[id].is_enabled = ping_data->is_enabled;
       }
       if (ping_data->active_days == kNeverPinged ||
           ping_data->active_days > 0) {
         if (!ping_value.empty())
           ping_value += "&";
         ping_value += "a=" + base::IntToString(ping_data->active_days);
@@ skipping 39 matching lines @@
     NOTREACHED();
   return value == kNeverPinged || value > 0;
 }
 
 void ManifestFetchData::Merge(const ManifestFetchData& other) {
   DCHECK(full_url() == other.full_url());
   request_ids_.insert(other.request_ids_.begin(), other.request_ids_.end());
 }
 
 }  // namespace extensions