ExtensionUpdater: Abstract ExtensionDownloader creation

chrome/browser/extensions/updater/extension_updater.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_UPDATER_H_
 #define CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_UPDATER_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <stack>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/extensions/updater/extension_downloader.h"
 #include "chrome/browser/extensions/updater/extension_downloader_delegate.h"
 #include "chrome/browser/extensions/updater/manifest_fetch_data.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/extension_registry_observer.h"
-#include "google_apis/gaia/identity_provider.h"
 #include "url/gurl.h"
 
 class ExtensionServiceInterface;
 class PrefService;
 class Profile;
 
 namespace content {
 class BrowserContext;
 }
 
 namespace extensions {
 
 class ExtensionCache;
-class ExtensionDownloader;
 class ExtensionPrefs;
 class ExtensionRegistry;
 class ExtensionSet;
 class ExtensionUpdaterTest;
 
 // A class for doing auto-updates of installed Extensions. Used like this:
 //
 // ExtensionUpdater* updater = new ExtensionUpdater(my_extensions_service,
 //                                                  extension_prefs,
 //                                                  pref_service,
 //                                                  profile,
-//                                                  update_frequency_secs);
+//                                                  update_frequency_secs,
+//                                                  downloader_factory);
 // updater->Start();
 // ....
 // updater->Stop();
 class ExtensionUpdater : public ExtensionDownloaderDelegate,
                          public ExtensionRegistryObserver,
                          public content::NotificationObserver {
  public:
   typedef base::Closure FinishedCallback;
 
   struct CheckParams {
@@ skipping 17 matching lines @@
 
   // Holds a pointer to the passed |service|, using it for querying installed
   // extensions and installing updated ones. The |frequency_seconds| parameter
   // controls how often update checks are scheduled.
   ExtensionUpdater(ExtensionServiceInterface* service,
                    ExtensionPrefs* extension_prefs,
                    PrefService* prefs,
                    Profile* profile,
                    int frequency_seconds,
                    ExtensionCache* cache,
-                   scoped_ptr<IdentityProvider> identity_provider);
+                   const ExtensionDownloader::Factory& downloader_factory);
 
   virtual ~ExtensionUpdater();
 
   // Starts the updater running.  Should be called at most once.
   void Start();
 
   // Stops the updater running, cancelling any outstanding update manifest and
   // crx downloads. Does not cancel any in-progress installs.
   void Stop();
 
@@ skipping 47 matching lines @@
     ~InProgressCheck();
 
     bool install_immediately;
     FinishedCallback callback;
     // The ids of extensions that have in-progress update checks.
     std::list<std::string> in_progress_ids_;
   };
 
   struct ThrottleInfo;
 
+  // Ensure that we have a valid ExtensionDownloader instance referenced by
+  // |downloader|.
+  void EnsureDownloaderCreated();
+
   // Computes when to schedule the first update check.
   base::TimeDelta DetermineFirstCheckDelay();
 
   // Sets the timer to call TimerFired after roughly |target_delay| from now.
   // To help spread load evenly on servers, this method adds some random
   // jitter. It also saves the scheduled time so it can be reloaded on
   // browser restart.
   void ScheduleNextCheck(const base::TimeDelta& target_delay);
 
   // Add fetch records for extensions that are installed to the downloader,
@@ skipping 63 matching lines @@
                               const FinishedCallback& callback);
 
   // Whether Start() has been called but not Stop().
   bool alive_;
 
   base::WeakPtrFactory<ExtensionUpdater> weak_ptr_factory_;
 
   // Pointer back to the service that owns this ExtensionUpdater.
   ExtensionServiceInterface* service_;
 
+  // A closure passed into the ExtensionUpdater to teach it how to construct
+  // new ExtensionDownloader instances.
+  const ExtensionDownloader::Factory downloader_factory_;
+
   // Fetches the crx files for the extensions that have an available update.
   scoped_ptr<ExtensionDownloader> downloader_;
 
   base::OneShotTimer<ExtensionUpdater> timer_;
   int frequency_seconds_;
   bool will_check_soon_;
 
   ExtensionPrefs* extension_prefs_;
   PrefService* prefs_;
   Profile* profile_;
@@ skipping 12 matching lines @@
   bool crx_install_is_running_;
 
   // Fetched CRX files waiting to be installed.
   std::stack<FetchedCRXFile> fetched_crx_files_;
   FetchedCRXFile current_crx_file_;
 
   CheckParams default_params_;
 
   ExtensionCache* extension_cache_;
 
-  // Provided to the ExtensionDownloader to enable OAuth2 support.
-  scoped_ptr<IdentityProvider> webstore_identity_provider_;
-
   // Keeps track of when an extension tried to update itself, so we can throttle
   // checks to prevent too many requests from being made.
   std::map<std::string, ThrottleInfo> throttle_info_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionUpdater);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_UPDATER_H_