Move OmahaQueryParams to a component and add a delegate interface.

chrome/browser/extensions/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 <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 "chrome/browser/omaha_query_params/omaha_query_params.h"
+#include "components/omaha_query_params/omaha_query_params.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)
     : base_url_(update_url),
       full_url_(update_url) {
   std::string query = full_url_.has_query() ?
       full_url_.query() + "&" : std::string();
-  query += chrome::OmahaQueryParams::Get(chrome::OmahaQueryParams::CRX);
+  query += omaha_query_params::OmahaQueryParams::Get(
+      omaha_query_params::OmahaQueryParams::CRX);
   GURL::Replacements replacements;
   replacements.SetQueryStr(query);
   full_url_ = full_url_.ReplaceComponents(replacements);
 
   request_ids_.insert(request_id);
 }
 
 ManifestFetchData::~ManifestFetchData() {}
 
 // The format for request parameters in update checks is:
@@ skipping 112 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