Revert "BUG=12114"

chrome/common/extensions/extension.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_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 20 matching lines @@
                         // registry on Windows).
     LOAD                // --load-extension.
   };
 
   enum State {
     DISABLED,
     ENABLED,
     KILLBIT,  // Don't install/upgrade (applies to external extensions only).
   };
 
-  enum InstallType {
-    DOWNGRADE,
-    REINSTALL,
-    UPGRADE,
-    NEW_INSTALL
-  };
-
   // An NPAPI plugin included in the extension.
   struct PluginInfo {
     FilePath path;  // Path to the plugin.
     bool is_public;  // False if only this extension can load this plugin.
   };
 
   // The name of the manifest inside an extension.
   static const char kManifestFilename[];
 
   // Keys used in JSON representation of extensions.
   static const wchar_t* kBackgroundKey;
   static const wchar_t* kContentScriptsKey;
   static const wchar_t* kCssKey;
   static const wchar_t* kDescriptionKey;
   static const wchar_t* kIconPathKey;
+  static const wchar_t* kIdKey;
   static const wchar_t* kJsKey;
   static const wchar_t* kMatchesKey;
   static const wchar_t* kNameKey;
-  static const wchar_t* kPageActionIdKey;
   static const wchar_t* kPageActionsKey;
   static const wchar_t* kPermissionsKey;
   static const wchar_t* kPluginsKey;
   static const wchar_t* kPluginsPathKey;
   static const wchar_t* kPluginsPublicKey;
   static const wchar_t* kPublicKeyKey;
   static const wchar_t* kSignatureKey;
   static const wchar_t* kRunAtKey;
   static const wchar_t* kThemeKey;
   static const wchar_t* kThemeImagesKey;
@@ skipping 10 matching lines @@
   static const char* kRunAtDocumentEndValue;
   static const char* kPageActionTypeTab;
   static const char* kPageActionTypePermanent;
 
   // Error messages returned from InitFromValue().
   static const char* kInvalidContentScriptError;
   static const char* kInvalidContentScriptsListError;
   static const char* kInvalidCssError;
   static const char* kInvalidCssListError;
   static const char* kInvalidDescriptionError;
+  static const char* kInvalidIdError;
   static const char* kInvalidJsError;
   static const char* kInvalidJsListError;
-  static const char* kInvalidKeyError;
   static const char* kInvalidManifestError;
   static const char* kInvalidMatchCountError;
   static const char* kInvalidMatchError;
   static const char* kInvalidMatchesError;
   static const char* kInvalidNameError;
   static const char* kInvalidPluginsError;
   static const char* kInvalidPluginsPathError;
   static const char* kInvalidPluginsPublicError;
 
   static const char* kInvalidBackgroundError;
   static const char* kInvalidRunAtError;
-  static const char* kInvalidSignatureError;
   static const char* kInvalidToolstripError;
   static const char* kInvalidToolstripsError;
   static const char* kInvalidVersionError;
   static const char* kInvalidPageActionError;
   static const char* kInvalidPageActionsListError;
   static const char* kInvalidPageActionIconPathError;
-  static const char* kInvalidPageActionIdError;
   static const char* kInvalidPageActionTooltipError;
   static const char* kInvalidPageActionTypeValueError;
   static const char* kInvalidPermissionsError;
   static const char* kInvalidPermissionCountWarning;
   static const char* kInvalidPermissionError;
   static const char* kInvalidPermissionSchemeError;
   static const char* kInvalidZipHashError;
   static const char* kInvalidThemeError;
   static const char* kInvalidThemeImagesMissingError;
   static const char* kInvalidThemeImagesError;
   static const char* kInvalidThemeColorsError;
   static const char* kInvalidThemeTintsError;
   static const char* kThemesCannotContainExtensionsError;
   static const char* kMissingFileError;
 
 #if defined(OS_WIN)
   static const char* kExtensionRegistryPath;
 #endif
 
   // The number of bytes in a legal id.
   static const size_t kIdSize;
 
   Extension() : location_(INVALID), is_theme_(false) {}
   explicit Extension(const FilePath& path);
   virtual ~Extension();
 
-  // Resets the id counter. This is only useful for unit tests.
-  static void ResetGeneratedIdCounter() {
-    id_counter_ = 0;
-  }
-
   // Checks to see if the extension has a valid ID.
   static bool IdIsValid(const std::string& id);
 
   // Whether the |location| is external or not.
   static inline bool IsExternalLocation(Location location) {
     return location == Extension::EXTERNAL_PREF ||
            location == Extension::EXTERNAL_REGISTRY;
   }
 
   // Returns an absolute url to a resource inside of an extension. The
@@ skipping 20 matching lines @@
 
   // |input| is expected to be the text of an rsa public or private key. It
   // tolerates the presence or absence of bracking header/footer like this:
   //     -----(BEGIN|END) [RSA PUBLIC/PRIVATE] KEY-----
   // and may contain newlines.
   static bool ParsePEMKeyBytes(const std::string& input, std::string* output);
 
   // Does a simple base64 encoding of |input| into |output|.
   static bool ProducePEM(const std::string& input, std::string* output);
 
-  // Note: The result is coverted to lower-case because the browser enforces
-  // hosts to be lower-case in omni-bar.
-  static bool GenerateIdFromPublicKey(const std::string& input,
-                                      std::string* output);
-
   // Expects base64 encoded |input| and formats into |output| including
   // the appropriate header & footer.
   static bool FormatPEMForFileOutput(const std::string input,
       std::string* output, bool is_public);
 
   // Initialize the extension from a parsed manifest.
   // If |require_id| is true, will return an error if the "id" key is missing
   // from the value.
   bool InitFromValue(const DictionaryValue& value, bool require_id,
                      std::string* error);
 
   const FilePath& path() const { return path_; }
   const GURL& url() const { return extension_url_; }
   const Location location() const { return location_; }
   void set_location(Location location) { location_ = location; }
   const std::string& id() const { return id_; }
   const Version* version() const { return version_.get(); }
   // String representation of the version number.
   const std::string VersionString() const;
   const std::string& name() const { return name_; }
-  const std::string& public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   const UserScriptList& content_scripts() const { return content_scripts_; }
   const PageActionMap& page_actions() const { return page_actions_; }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const GURL& background_url() const { return background_url_; }
   const std::vector<std::string>& toolstrips() const { return toolstrips_; }
   const std::vector<URLPattern>& permissions() const { return permissions_; }
 
   // Retrieves a page action by |id|.
   const PageAction* GetPageAction(std::string id) const;
 
   // Returns the origin of this extension. This function takes a |registry_path|
   // so that the registry location can be overwritten during testing.
   Location ExternalExtensionInstallType(std::string registry_path);
 
   // Theme-related.
   DictionaryValue* GetThemeImages() const { return theme_images_.get(); }
   DictionaryValue* GetThemeColors() const { return theme_colors_.get(); }
   DictionaryValue* GetThemeTints() const { return theme_tints_.get(); }
   DictionaryValue* GetThemeDisplayProperties() const {
     return theme_display_properties_.get();
   }
   bool IsTheme() { return is_theme_; }
 
   // Returns a list of paths (relative to the extension dir) for images that
   // the browser might load (like themes and page action icons).
   std::set<FilePath> GetBrowserImages();
 
  private:
-  // Counter used to assign ids to extensions that are loaded using 
-  // --load-extension.
-  static int id_counter_;
-
-  // Returns the next counter id. Intentionally post-incrementing so that first
-  // value is 0.
-  static int NextGeneratedId() { return id_counter_++; }
-
   // Helper method that loads a UserScript object from a
   // dictionary in the content_script list of the manifest.
   bool LoadUserScriptHelper(const DictionaryValue* content_script,
                             int definition_index,
                             std::string* error,
                             UserScript* result);
 
   // Helper method that loads a PageAction object from a
   // dictionary in the page_action list of the manifest.
   PageAction* LoadPageActionHelper(const DictionaryValue* page_action,
@@ skipping 39 matching lines @@
   // Optional list of NPAPI plugins and associated properties.
   std::vector<PluginInfo> plugins_;
 
   // Optional URL to a master page of which a single instance should be always
   // loaded in the background.
   GURL background_url_;
 
   // Paths to HTML files to be displayed in the toolbar.
   std::vector<std::string> toolstrips_;
 
-  // The public key ('key' in the manifest) used to sign the contents of the
-  // crx package ('signature' in the manifest)
-  std::string public_key_;
+  // A SHA1 hash of the contents of the zip file.  Note that this key is only
+  // present in the manifest that's prepended to the zip.  The inner manifest
+  // will not have this key.
+  std::string zip_hash_;
 
   // A map of resource id's to relative file paths.
   scoped_ptr<DictionaryValue> theme_images_;
 
   // A map of color names to colors.
   scoped_ptr<DictionaryValue> theme_colors_;
 
   // A map of color names to colors.
   scoped_ptr<DictionaryValue> theme_tints_;
 
   // A map of display properties.
   scoped_ptr<DictionaryValue> theme_display_properties_;
 
   // Whether the extension is a theme - if it is, certain things are disabled.
   bool is_theme_;
 
   // The sites this extension has permission to talk to (using XHR, etc).
   std::vector<URLPattern> permissions_;
 
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_