Reland: Factor Chrome details out of update manifest fetching.

chrome/browser/extensions/updater/extension_downloader.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_DOWNLOADER_H_
 #define CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_DOWNLOADER_H_
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/updater/extension_downloader_delegate.h"
-#include "chrome/browser/extensions/updater/manifest_fetch_data.h"
 #include "chrome/browser/extensions/updater/request_queue.h"
+#include "extensions/browser/updater/manifest_fetch_data.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/update_manifest.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 class IdentityProvider;
 
 namespace net {
 class URLFetcher;
@@ skipping 59 matching lines @@
   // Schedules an update check of the blacklist.
   void StartBlacklistUpdate(const std::string& version,
                             const ManifestFetchData::PingData& ping_data,
                             int request_id);
 
   // Sets an IdentityProvider to be used for OAuth2 authentication on protected
   // Webstore downloads.
   void SetWebstoreIdentityProvider(
       scoped_ptr<IdentityProvider> identity_provider);
 
+  void set_brand_code(const std::string& brand_code) {
+    brand_code_ = brand_code;
+  }
+
+  void set_manifest_query_params(const std::string& params) {
+    manifest_query_params_ = params;
+  }
+
+  void set_ping_enabled_domain(const std::string& domain) {
+    ping_enabled_domain_ = domain;
+  }
+
+  void set_enable_extra_update_metrics(bool enable) {
+    enable_extra_update_metrics_ = enable;
+  }
+
   // These are needed for unit testing, to help identify the correct mock
   // URLFetcher objects.
   static const int kManifestFetcherId = 1;
   static const int kExtensionFetcherId = 2;
 
   // Update AppID for extension blacklist.
   static const char kBlacklistAppID[];
 
   static const int kMaxRetries = 10;
 
@@ skipping 126 matching lines @@
                                            const net::URLRequestStatus& status,
                                            int response_code);
 
   // OAuth2TokenService::Consumer implementation.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                                  const GoogleServiceAuthError& error) OVERRIDE;
 
+  ManifestFetchData* CreateManifestFetchData(const GURL& update_url,
+                                             int request_id);
+
   // The delegate that receives the crx files downloaded by the
   // ExtensionDownloader, and that fills in optional ping and update url data.
   ExtensionDownloaderDelegate* delegate_;
 
   // The request context to use for the URLFetchers.
   scoped_refptr<net::URLRequestContextGetter> request_context_;
 
   // Collects UMA samples that are reported when ReportStats() is called.
   URLStats url_stats_;
 
@@ skipping 24 matching lines @@
   // download requests. May be NULL.
   scoped_ptr<IdentityProvider> identity_provider_;
 
   // A Webstore download-scoped access token for the |identity_provider_|'s
   // active account, if any.
   std::string access_token_;
 
   // A pending token fetch request.
   scoped_ptr<OAuth2TokenService::Request> access_token_request_;
 
+  // Brand code to include with manifest fetch queries if sending ping data.
+  std::string brand_code_;
+
+  // Baseline parameters to include with manifest fetch queries.
+  std::string manifest_query_params_;
+
+  // Domain to enable ping data. Ping data will be sent with manifest fetches
+  // to update URLs which match this domain. Defaults to empty (no domain).
+  std::string ping_enabled_domain_;
+
+  // Indicates whether or not extra metrics should be included with ping data.
+  // Defaults to |false|.
+  bool enable_extra_update_metrics_;
+
   // Used to create WeakPtrs to |this|.
   base::WeakPtrFactory<ExtensionDownloader> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionDownloader);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_DOWNLOADER_H_