cc: Switch to Chromium DCHECKs LOGs

We can't compile-guard code and use DCHECK since it can be enabled at runtime. So we guard the DCHECKs that we want to rely on conditionally-compiled code in !NDEBUG compile guards.

This also replaces use of LOG_ERROR("Foo") with LOG(ERROR)<<"Foo";

This was previously discussed and committed as https://codereview.chromium.org/11048044/
using a guard based on LOGGING_IS_OFFICIAL_BUILD, however this was not sufficient since there are build configurations that are official builds but have dchecks compiled.

R=enne

Review URL: https://codereview.chromium.org/11192030

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

1 files changed, 3 insertions, 2 deletions

diff --git a/cc/scoped_ptr_hash_map.h b/cc/scoped_ptr_hash_map.h
index 1cea5c0..60eadee 100644
--- a/cc/scoped_ptr_hash_map.h
+++ b/cc/scoped_ptr_hash_map.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
+#include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/memory/scoped_ptr.h"
 
@@ -66,7 +67,7 @@ class ScopedPtrHashMap {
   }
 
   scoped_ptr<Value> take(iterator it) {
-    ASSERT(it != data_.end());
+    DCHECK(it != data_.end());
     if (it == data_.end())
       return scoped_ptr<Value>(NULL);
 
@@ -86,7 +87,7 @@ class ScopedPtrHashMap {
   }
 
   scoped_ptr<Value> take_and_erase(iterator it) {
-    ASSERT(it != data_.end());
+    DCHECK(it != data_.end());
     if (it == data_.end())
       return scoped_ptr<Value>(NULL);