summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/convert_web_app.cc
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 17:37:14 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 17:37:14 +0000
commit4b559b4ddffc0b7f688019bcb80658f05e063af7 (patch)
tree0be21d8914de707f5125d2cb66733cbcf088606c /chrome/browser/extensions/convert_web_app.cc
parent056dd45d610de34312344445d7b078a31f4a1e20 (diff)
downloadchromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.zip
chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.gz
chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.bz2
Move crypto files out of base, to a top level directory.
src/crypto is now an independent project that contains our cryptographic primitives (except md5 and sha1). This removes the base dependency from nss, openssl and sqlite. BUG=76996 TEST=none Review URL: http://codereview.chromium.org/6805019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/convert_web_app.cc')
-rw-r--r--chrome/browser/extensions/convert_web_app.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc
index 27a0fc9..f3305a7 100644
--- a/chrome/browser/extensions/convert_web_app.cc
+++ b/chrome/browser/extensions/convert_web_app.cc
@@ -15,10 +15,10 @@
#include "base/logging.h"
#include "base/memory/scoped_temp_dir.h"
#include "base/path_service.h"
-#include "base/sha2.h"
#include "base/stringprintf.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
+#include "crypto/sha2.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
@@ -46,12 +46,12 @@ const char kIconsDirName[] = "icons";
// auto-updated using ExtensionUpdater. But Chrome does notice updates to the
// manifest and regenerates these extensions.
std::string GenerateKey(const GURL& manifest_url) {
- char raw[base::SHA256_LENGTH] = {0};
+ char raw[crypto::SHA256_LENGTH] = {0};
std::string key;
- base::SHA256HashString(manifest_url.spec().c_str(),
- raw,
- base::SHA256_LENGTH);
- base::Base64Encode(std::string(raw, base::SHA256_LENGTH), &key);
+ crypto::SHA256HashString(manifest_url.spec().c_str(),
+ raw,
+ crypto::SHA256_LENGTH);
+ base::Base64Encode(std::string(raw, crypto::SHA256_LENGTH), &key);
return key;
}