Fix 2 bugs related to remembering loaded unpacked extensions.

chrome/browser/extensions/extension_prefs.h

 // Copyright (c) 2009 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_EXTENSION_PREFS_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 41 matching lines @@
   // Called when an extension is uninstalled, so that prefs get cleaned up.
   void OnExtensionUninstalled(const Extension* extension,
                               bool external_uninstall);
 
   // Returns the state (enabled/disabled) of the given extension.
   Extension::State GetExtensionState(const std::string& extension_id);
 
   // Called to change the extension's state when it is enabled/disabled.
   void SetExtensionState(Extension* extension, Extension::State);
 
-  // If |require| is true, the preferences for |extension| will be set to
+  // Did the extension ask to escalate its permission during an upgrade?
+  bool DidExtensionEscalatePermissions(const std::string& id);
+
+  // If |did_escalate| is true, the preferences for |extension| will be set to
   // require the install warning when the user tries to enable.
-  void SetShowInstallWarningOnEnable(Extension* extension, bool require);
+  void SetDidExtensionEscalatePermissions(Extension* extension,
+                                          bool did_escalate);
 
   // Returns the version string for the currently installed extension, or
   // the empty string if not found.
   std::string GetVersionString(const std::string& extension_id);
 
   // Re-writes the extension manifest into the prefs.
   // Called to change the extension's manifest when it's re-localized.
   void UpdateManifest(Extension* extension);
 
   // Returns extension path based on extension ID, or empty FilePath on error.
   FilePath GetExtensionPath(const std::string& extension_id);
 
   // Returns base extensions install directory.
   const FilePath& install_directory() const { return install_directory_; }
 
   // Updates the prefs based on the blacklist.
   void UpdateBlacklist(const std::set<std::string>& blacklist_set);
 
   // Based on extension id, checks prefs to see if it is blacklisted.
   bool IsExtensionBlacklisted(const std::string& id);
 
-  // Did the extension ask to escalate its permission during an upgrade?
-  bool DidExtensionEscalatePermissions(const std::string& id);
-
   // Returns the last value set via SetLastPingDay. If there isn't such a
   // pref, the returned Time will return true for is_null().
   base::Time LastPingDay(const std::string& extension_id);
 
   // The time stored is based on the server's perspective of day start time, not
   // the client's.
   void SetLastPingDay(const std::string& extension_id, const base::Time& time);
 
   // Returns true if the user enabled this extension to be loaded in incognito
   // mode.
   bool IsIncognitoEnabled(const std::string& extension_id);
   void SetIsIncognitoEnabled(const std::string& extension_id, bool enabled);
 
   // Saves ExtensionInfo for each installed extension with the path to the
   // version directory and the location. Blacklisted extensions won't be saved
   // and neither will external extensions the user has explicitly uninstalled.
   // Caller takes ownership of returned structure.
-  static ExtensionsInfo* CollectExtensionsInfo(ExtensionPrefs* extension_prefs);
+  ExtensionsInfo* GetInstalledExtensionsInfo();
+
+  // Returns the ExtensionInfo from the prefs for the given extension. If the
+  // extension is not present, NULL is returned.
+  ExtensionInfo* GetInstalledExtensionInfo(const std::string& extension_id);
 
   static void RegisterUserPrefs(PrefService* prefs);
 
  private:
 
   // Converts absolute paths in the pref to paths relative to the
   // install_directory_.
   void MakePathsRelative();
 
   // Converts internal relative paths to be absolute. Used for export to
@@ skipping 34 matching lines @@
   FilePath install_directory_;
 
   // The URLs of all of the toolstrips.
   URLList shelf_order_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPrefs);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_