ExtensionUpdater: Abstract ExtensionDownloader creation

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>
@@ skipping 29 matching lines @@
 struct UpdateDetails {
   UpdateDetails(const std::string& id, const base::Version& version);
   ~UpdateDetails();
 
   std::string id;
   base::Version version;
 };
 
 class ExtensionCache;
 class ExtensionUpdaterTest;
-class WebstoreOAuth2TokenProvider;
 
 // A class that checks for updates of a given list of extensions, and downloads
 // the crx file when updates are found. It uses a |ExtensionDownloaderDelegate|
 // that takes ownership of the downloaded crx files, and handles events during
 // the update check.
 class ExtensionDownloader
     : public net::URLFetcherDelegate,
       public OAuth2TokenService::Consumer {
  public:
+  // A closure which constructs a new ExtensionDownloader to be owned by the
+  // caller.
+  typedef base::Callback<
+      scoped_ptr<ExtensionDownloader>(ExtensionDownloaderDelegate* delegate)>
+      Factory;
+
   // |delegate| is stored as a raw pointer and must outlive the
-  // ExtensionDownloader. |webstore_identity_provider| may be NULL if this
-  // ExtensionDownloader does not need OAuth2 support; if not NULL, the
-  // given IdentityProvider must outlive this ExtensionDownloader.
+  // ExtensionDownloader.
   ExtensionDownloader(ExtensionDownloaderDelegate* delegate,
-                      net::URLRequestContextGetter* request_context,
-                      IdentityProvider* webstore_identity_provider);
+                      net::URLRequestContextGetter* request_context);
   virtual ~ExtensionDownloader();
 
   // Adds |extension| to the list of extensions to check for updates.
   // Returns false if the |extension| can't be updated due to invalid details.
   // In that case, no callbacks will be performed on the |delegate_|.
   // The |request_id| is passed on as is to the various |delegate_| callbacks.
   // This is used for example by ExtensionUpdater to keep track of when
   // potentially concurrent update checks complete.
   bool AddExtension(const Extension& extension, int request_id);
 
   // Adds extension |id| to the list of extensions to check for updates.
   // Returns false if the |id| can't be updated due to invalid details.
   // In that case, no callbacks will be performed on the |delegate_|.
   // The |request_id| is passed on as is to the various |delegate_| callbacks.
   // This is used for example by ExtensionUpdater to keep track of when
   // potentially concurrent update checks complete.
   bool AddPendingExtension(const std::string& id,
                            const GURL& update_url,
                            int request_id);
 
   // Schedules a fetch of the manifest of all the extensions added with
   // AddExtension() and AddPendingExtension().
   void StartAllPending(ExtensionCache* cache);
 
   // 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);
+
   // 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 162 matching lines @@
   RequestQueue<ExtensionFetch> extensions_queue_;
 
   // Maps an extension-id to its PingResult data.
   std::map<std::string, ExtensionDownloaderDelegate::PingResult> ping_results_;
 
   // Cache for .crx files.
   ExtensionCache* extension_cache_;
 
   // An IdentityProvider which may be used for authentication on protected
   // download requests. May be NULL.
-  IdentityProvider* identity_provider_;
+  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_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionDownloader);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_DOWNLOADER_H_