Revert 107042 - Replace most LOG/CHECK statements with DLOG/DCHECK statements in base.

I tried hard not to change CHECKs that had side effects. I kept fatal checks
that seemed security or debugging-info (in crash reports) sensitive, and ones
that seems particularly well-conceived.
Review URL: http://codereview.chromium.org/8368009

TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/8351025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107051 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 9 deletions

diff --git a/base/sha1_win.cc b/base/sha1_win.cc
index 626f41b..2edfb3d 100644
--- a/base/sha1_win.cc
+++ b/base/sha1_win.cc
@@ -18,20 +18,20 @@ std::string SHA1HashString(const std::string& str) {
   ScopedHCRYPTPROV provider;
   if (!CryptAcquireContext(provider.receive(), NULL, NULL, PROV_RSA_FULL,
                            CRYPT_VERIFYCONTEXT)) {
-    DLOG(ERROR) << "CryptAcquireContext failed: " << GetLastError();
+    LOG(ERROR) << "CryptAcquireContext failed: " << GetLastError();
     return std::string(kSHA1Length, '\0');
   }
 
   {
     ScopedHCRYPTHASH hash;
     if (!CryptCreateHash(provider, CALG_SHA1, 0, 0, hash.receive())) {
-      DLOG(ERROR) << "CryptCreateHash failed: " << GetLastError();
+      LOG(ERROR) << "CryptCreateHash failed: " << GetLastError();
       return std::string(kSHA1Length, '\0');
     }
 
     if (!CryptHashData(hash, reinterpret_cast<CONST BYTE*>(str.data()),
                        static_cast<DWORD>(str.length()), 0)) {
-      DLOG(ERROR) << "CryptHashData failed: " << GetLastError();
+      LOG(ERROR) << "CryptHashData failed: " << GetLastError();
       return std::string(kSHA1Length, '\0');
     }
 
@@ -40,8 +40,7 @@ std::string SHA1HashString(const std::string& str) {
     if (!CryptGetHashParam(hash, HP_HASHSIZE,
                            reinterpret_cast<unsigned char*>(&hash_len),
                            &buffer_size, 0)) {
-      DLOG(ERROR) << "CryptGetHashParam(HP_HASHSIZE) failed: "
-                  << GetLastError();
+      LOG(ERROR) << "CryptGetHashParam(HP_HASHSIZE) failed: " << GetLastError();
       return std::string(kSHA1Length, '\0');
     }
 
@@ -51,14 +50,13 @@ std::string SHA1HashString(const std::string& str) {
         // but so that result.length() is correctly set to |hash_len|.
         reinterpret_cast<BYTE*>(WriteInto(&result, hash_len + 1)), &hash_len,
         0))) {
-      DLOG(ERROR) << "CryptGetHashParam(HP_HASHVAL) failed: "
-                  << GetLastError();
+      LOG(ERROR) << "CryptGetHashParam(HP_HASHVAL) failed: " << GetLastError();
       return std::string(kSHA1Length, '\0');
     }
 
     if (hash_len != kSHA1Length) {
-      DLOG(ERROR) << "Returned hash value is wrong length: " << hash_len
-                  << " should be " << kSHA1Length;
+      LOG(ERROR) << "Returned hash value is wrong length: " << hash_len
+                 << " should be " << kSHA1Length;
       return std::string(kSHA1Length, '\0');
     }