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

Unified Diff: base/trace_event/memory_allocator_dump_guid.cc

Issue 1641513004: Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « base/trace_event/memory_allocator_dump_guid.h ('k') | base/trace_event/memory_allocator_dump_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/memory_allocator_dump_guid.cc
diff --git a/base/trace_event/memory_allocator_dump_guid.cc b/base/trace_event/memory_allocator_dump_guid.cc
index a4ea50d416a0d5bd784e7c74501f77ad45d7b49f..69c7de6c848bb62091a56dfd69d2341817515fba 100644
--- a/base/trace_event/memory_allocator_dump_guid.cc
+++ b/base/trace_event/memory_allocator_dump_guid.cc
@@ -5,12 +5,21 @@
#include "base/trace_event/memory_allocator_dump_guid.h"
#include "base/format_macros.h"
-#include "base/hash.h"
+#include "base/sha1.h"
#include "base/strings/stringprintf.h"
namespace base {
namespace trace_event {
+namespace {
+uint64 HashString(const std::string& str) {
+ uint64 hash[(kSHA1Length + sizeof(uint64) - 1) / sizeof(uint64)] = {0};
+ SHA1HashBytes(reinterpret_cast<const unsigned char*>(str.data()), str.size(),
+ reinterpret_cast<unsigned char*>(hash));
+ return hash[0];
+}
+} // namespace
+
MemoryAllocatorDumpGuid::MemoryAllocatorDumpGuid(uint64 guid) : guid_(guid) {
}
@@ -19,8 +28,7 @@ MemoryAllocatorDumpGuid::MemoryAllocatorDumpGuid()
}
MemoryAllocatorDumpGuid::MemoryAllocatorDumpGuid(const std::string& guid_str)
- : MemoryAllocatorDumpGuid(Hash(guid_str)) {
-}
+ : MemoryAllocatorDumpGuid(HashString(guid_str)) {}
std::string MemoryAllocatorDumpGuid::ToString() const {
return StringPrintf("%" PRIx64, guid_);
« no previous file with comments | « base/trace_event/memory_allocator_dump_guid.h ('k') | base/trace_event/memory_allocator_dump_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698