Fix for Bug 50726 "Save extension list and "winning" prefs from extensions"

chrome/browser/extensions/extensions_service.h

 // Copyright (c) 2010 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_EXTENSIONS_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSIONS_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 130 matching lines @@
 
   // Determine if the downloaded extension came from the theme mini-gallery,
   // Used to test if we need to show the "Loading" dialog for themes.
   static bool IsDownloadFromMiniGallery(const GURL& download_url);
 
   // Attempts to uninstall an extension from a given ExtensionService. Returns
   // true iff the target extension exists.
   static bool UninstallExtensionHelper(ExtensionsService* extensions_service,
                                        const std::string& extension_id);
 
+  // Constructor stores pointers to |profile| and |extension_prefs| but
+  // ownership remains at caller.
   ExtensionsService(Profile* profile,
                     const CommandLine* command_line,
                     const FilePath& install_directory,
+                    ExtensionPrefs* extension_prefs,
                     bool autoupdate_enabled);
 
   // Gets the list of currently installed extensions.
   virtual const ExtensionList* extensions() const { return &extensions_; }
   virtual const ExtensionList* disabled_extensions() const {
     return &disabled_extensions_;
   }
 
   // Gets the set of pending extensions.
   virtual const PendingExtensionMap& pending_extensions() const {
@@ skipping 231 matching lines @@
   bool show_extensions_prompts() {
     return show_extensions_prompts_;
   }
 
   Profile* profile() { return profile_; }
 
   // Profile calls this when it is being destroyed so that we know not to call
   // it.
   void DestroyingProfile();
 
-  ExtensionPrefs* extension_prefs() { return extension_prefs_.get(); }
+  ExtensionPrefs* extension_prefs() { return extension_prefs_; }
 
   // Whether the extension service is ready.
   // TODO(skerner): Get rid of this method.  crbug.com/63756
   bool is_ready() { return ready_; }
 
   // Note that this may return NULL if autoupdate is not turned on.
   ExtensionUpdater* updater() { return updater_.get(); }
 
   ExtensionToolbarModel* toolbar_model() { return &toolbar_model_; }
 
@@ skipping 82 matching lines @@
 
   // Helper methods to configure the storage services accordingly.
   void GrantProtectedStorage(const Extension* extension);
   void RevokeProtectedStorage(const Extension* extension);
   void GrantUnlimitedStorage(const Extension* extension);
   void RevokeUnlimitedStorage(const Extension* extension);
 
   // The profile this ExtensionsService is part of.
   Profile* profile_;
 
-  // Preferences for the owning profile.
-  scoped_ptr<ExtensionPrefs> extension_prefs_;
+  // Preferences for the owning profile (weak reference).
+  ExtensionPrefs* extension_prefs_;
 
   // The current list of installed extensions.
   ExtensionList extensions_;
 
   // The list of installed extensions that have been disabled.
   ExtensionList disabled_extensions_;
 
   // The set of pending extensions.
   PendingExtensionMap pending_extensions_;
 
@@ skipping 78 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(ExtensionsServiceTest,
                            UpdatePendingExtensionAlreadyInstalled);
   FRIEND_TEST_ALL_PREFIXES(ExtensionsServiceTest,
                            InstallAppsWithUnlimtedStorage);
   FRIEND_TEST_ALL_PREFIXES(ExtensionsServiceTest,
                            InstallAppsAndCheckStorageProtection);
   DISALLOW_COPY_AND_ASSIGN(ExtensionsService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSIONS_SERVICE_H_