ExtensionUpdater: Abstract ExtensionDownloader creation

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2013 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/extension_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 
@@ skipping 70 matching lines @@
 #include "webkit/browser/fileapi/file_system_backend.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #endif
 
 // TODO(thestig): Eventually remove the #ifdefs when ExtensionService is no
 // longer used on mobile.
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
+#include "chrome/browser/extensions/updater/extension_downloader.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DevToolsAgentHost;
 using extensions::CrxInstaller;
 using extensions::Extension;
+using extensions::ExtensionDownloader;
+using extensions::ExtensionDownloaderDelegate;
 using extensions::ExtensionIdSet;
 using extensions::ExtensionInfo;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionSet;
 using extensions::FeatureSwitch;
 using extensions::InstallVerifier;
 using extensions::ManagementPolicy;
 using extensions::Manifest;
 using extensions::PermissionMessage;
 using extensions::PermissionMessages;
@@ skipping 211 matching lines @@
           switches::kExtensionsUpdateFrequency),
           &update_frequency);
     }
     updater_.reset(new extensions::ExtensionUpdater(
         this,
         extension_prefs,
         profile->GetPrefs(),
         profile,
         update_frequency,
         extensions::ExtensionCache::GetInstance(),
-        CreateWebstoreIdentityProvider(profile_)));
+        base::Bind(&ExtensionService::CreateExtensionDownloader,
+                   base::Unretained(this))));

[Yoyo Zhou, 2014/08/11 23:19:28]

Why not use weak pointers?

[Ken Rockot(use gerrit already), 2014/08/11 23:48:24]

Not allowed to use weak pointers when binding to methods that have a non-void
return value. We could work around this by instead having a void method populate
a scoped_ptr output argument, but that seemed ugly too. Given that we know the
ExtensionDownloader's lifetime can't extend beyond that of ExtensionService
anyway, I opted for Unretained.

   }
 #endif
 
   component_loader_.reset(
       new extensions::ComponentLoader(this,
                                       profile->GetPrefs(),
                                       g_browser_process->local_state(),
                                       profile));
 
   if (extensions_enabled_) {
@@ skipping 247 matching lines @@
 
   if (out_crx_installer)
     *out_crx_installer = installer.get();
 
   return true;
 #else
   return false;
 #endif
 }
 
+scoped_ptr<ExtensionDownloader> ExtensionService::CreateExtensionDownloader(
+    ExtensionDownloaderDelegate* delegate) {
+  scoped_ptr<ExtensionDownloader> downloader;
+#if defined(ENABLE_EXTENSIONS)
+  scoped_ptr<IdentityProvider> identity_provider =
+      CreateWebstoreIdentityProvider(profile_);
+  downloader.reset(new ExtensionDownloader(
+      delegate,
+      profile_->GetRequestContext()));
+  downloader->SetWebstoreIdentityProvider(identity_provider.Pass());
+#endif
+  return downloader.Pass();
+}
+
 void ExtensionService::ReloadExtensionImpl(
     // "transient" because the process of reloading may cause the reference
     // to become invalid. Instead, use |extension_id|, a copy.
     const std::string& transient_extension_id,
     bool be_noisy) {
 #if defined(ENABLE_EXTENSIONS)
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // If the extension is already reloading, don't reload again.
   if (extension_prefs_->GetDisableReasons(transient_extension_id) &
@@ skipping 1767 matching lines @@
 }
 
 void ExtensionService::OnProfileDestructionStarted() {
   ExtensionIdSet ids_to_unload = registry_->enabled_extensions().GetIDs();
   for (ExtensionIdSet::iterator it = ids_to_unload.begin();
        it != ids_to_unload.end();
        ++it) {
     UnloadExtension(*it, UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN);
   }
 }