Extensions: Move id_util functions to crx_file component.

extensions/common/extension.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 "extensions/common/extension.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
+#include "components/crx_file/id_util.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
-#include "extensions/common/id_util.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/manifest_handlers/permissions_parser.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/permissions/permissions_info.h"
 #include "extensions/common/switches.h"
 #include "extensions/common/url_pattern.h"
 #include "net/base/filename_util.h"
@@ skipping 89 matching lines @@
   extension->install_warnings_.swap(install_warnings);
 
   if (!extension->InitFromValue(flags, &error)) {
     *utf8_error = base::UTF16ToUTF8(error);
     return NULL;
   }
 
   return extension;
 }
 
-// static
-bool Extension::IdIsValid(const std::string& id) {
-  // Verify that the id is legal.
-  if (id.size() != (id_util::kIdSize * 2))
-    return false;
-
-  // We only support lowercase IDs, because IDs can be used as URL components
-  // (where GURL will lowercase it).
-  std::string temp = base::StringToLowerASCII(id);
-  for (size_t i = 0; i < temp.size(); i++)
-    if (temp[i] < 'a' || temp[i] > 'p')
-      return false;
-
-  return true;
-}
-
 Manifest::Type Extension::GetType() const {
   return converted_from_user_script() ?
       Manifest::TYPE_USER_SCRIPT : manifest_->type();
 }
 
 // static
 GURL Extension::GetResourceURL(const GURL& extension_url,
                                const std::string& relative_path) {
   DCHECK(extension_url.SchemeIs(extensions::kExtensionScheme));
   DCHECK_EQ("/", extension_url.path());
@@ skipping 301 matching lines @@
   }
 
   if (manifest->HasKey(keys::kPublicKey)) {
     std::string public_key;
     std::string public_key_bytes;
     if (!manifest->GetString(keys::kPublicKey, &public_key) ||
         !ParsePEMKeyBytes(public_key, &public_key_bytes)) {
       *error = base::ASCIIToUTF16(errors::kInvalidKey);
       return false;
     }
-    std::string extension_id = id_util::GenerateId(public_key_bytes);
+    std::string extension_id = crx_file::id_util::GenerateId(public_key_bytes);
     manifest->set_extension_id(extension_id);
     return true;
   }
 
   if (creation_flags & REQUIRE_KEY) {
     *error = base::ASCIIToUTF16(errors::kInvalidKey);
     return false;
   } else {
     // If there is a path, we generate the ID from it. This is useful for
     // development mode, because it keeps the ID stable across restarts and
     // reloading the extension.
-    std::string extension_id = id_util::GenerateIdForPath(path);
+    std::string extension_id = crx_file::id_util::GenerateIdForPath(path);
     if (extension_id.empty()) {
       NOTREACHED() << "Could not create ID from path.";
       return false;
     }
     manifest->set_extension_id(extension_id);
     return true;
   }
 }
 
 Extension::Extension(const base::FilePath& path,
                      scoped_ptr<extensions::Manifest> manifest)
     : manifest_version_(0),
       converted_from_user_script_(false),
       manifest_(manifest.release()),
       finished_parsing_manifest_(false),
       display_in_launcher_(true),
       display_in_new_tab_page_(true),
       wants_file_access_(false),
       creation_flags_(0) {
   DCHECK(path.empty() || path.IsAbsolute());
-  path_ = id_util::MaybeNormalizePath(path);
+  path_ = crx_file::id_util::MaybeNormalizePath(path);
 }
 
 Extension::~Extension() {
 }
 
 bool Extension::InitFromValue(int flags, base::string16* error) {
   DCHECK(error);
 
   creation_flags_ = flags;
 
@@ skipping 262 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions