Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1270)

Unified Diff: chrome/browser/extensions/extension_updater.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_updater.cc
===================================================================
--- chrome/browser/extensions/extension_updater.cc (revision 81350)
+++ chrome/browser/extensions/extension_updater.cc (working copy)
@@ -12,7 +12,6 @@
#include "base/file_util.h"
#include "base/metrics/histogram.h"
#include "base/rand_util.h"
-#include "base/sha2.h"
#include "base/stl_util-inl.h"
#include "base/string_number_conversions.h"
#include "base/string_split.h"
@@ -20,6 +19,7 @@
#include "base/time.h"
#include "base/threading/thread.h"
#include "base/version.h"
+#include "crypto/sha2.h"
#include "content/common/notification_service.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extension_error_reporter.h"
@@ -784,10 +784,10 @@
void ExtensionUpdater::ProcessBlacklist(const std::string& data) {
DCHECK(alive_);
// Verify sha256 hash value.
- char sha256_hash_value[base::SHA256_LENGTH];
- base::SHA256HashString(data, sha256_hash_value, base::SHA256_LENGTH);
+ char sha256_hash_value[crypto::SHA256_LENGTH];
+ crypto::SHA256HashString(data, sha256_hash_value, crypto::SHA256_LENGTH);
std::string hash_in_hex = base::HexEncode(sha256_hash_value,
- base::SHA256_LENGTH);
+ crypto::SHA256_LENGTH);
if (current_extension_fetch_.package_hash != hash_in_hex) {
NOTREACHED() << "Fetched blacklist checksum is not as expected. "
« no previous file with comments | « chrome/browser/extensions/extension_creator.cc ('k') | chrome/browser/extensions/sandboxed_extension_unpacker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698