Revert of Un-DCHECK-guard ThreadRestrictionVerifier for strings.

third_party/WebKit/Source/wtf/text/StringImpl.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 17 matching lines @@
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/StringHasher.h"
 #include "wtf/Vector.h"
 #include "wtf/WTFExport.h"
 #include "wtf/text/ASCIIFastPath.h"
 #include "wtf/text/Unicode.h"
 #include <limits.h>
 #include <string.h>
 
-// TODO(meade): Revert this by 17 Mar 17.
-// This is for investigating crbug.com/694520
-// #if DCHECK_IS_ON()
+#if DCHECK_IS_ON()
 #include "wtf/ThreadRestrictionVerifier.h"
-// #endif
+#endif
 
 #if OS(MACOSX)
 typedef const struct __CFString* CFStringRef;
 #endif
 
 #ifdef __OBJC__
 @class NSString;
 #endif
 
 namespace WTF {
@@ skipping 249 matching lines @@
     return m_hash;
   }
 
   unsigned hash() const {
     if (hasHash())
       return existingHash();
     return hashSlowCase();
   }
 
   ALWAYS_INLINE bool hasOneRef() const {
-    // TODO(meade): Revert this by 17 Mar 17.
-    // This is for investigating crbug.com/694520
-    // #if DCHECK_IS_ON()
-    CHECK(isStatic() || m_verifier.isSafeToUse()) << asciiForDebugging();
-    // #endif
+#if DCHECK_IS_ON()
+    DCHECK(isStatic() || m_verifier.isSafeToUse()) << asciiForDebugging();
+#endif
     return m_refCount == 1;
   }
 
   ALWAYS_INLINE void ref() const {
-    // TODO(meade): Revert this by 17 Mar 17.
-    // This is for investigating crbug.com/694520
-    // #if DCHECK_IS_ON()
-    CHECK(isStatic() || m_verifier.onRef(m_refCount)) << asciiForDebugging();
-    // #endif
+#if DCHECK_IS_ON()
+    DCHECK(isStatic() || m_verifier.onRef(m_refCount)) << asciiForDebugging();
+#endif
     ++m_refCount;
   }
 
   ALWAYS_INLINE void deref() const {
-    // TODO(meade): Revert this by 17 Mar 17.
-    // This is for investigating crbug.com/694520
-    // #if DCHECK_IS_ON()
-    CHECK(isStatic() || m_verifier.onDeref(m_refCount))
+#if DCHECK_IS_ON()
+    DCHECK(isStatic() || m_verifier.onDeref(m_refCount))
         << asciiForDebugging() << " " << currentThread();
-    // #endif
+#endif
     if (!--m_refCount)
       destroyIfNotStatic();
   }
 
   // FIXME: Does this really belong in StringImpl?
   template <typename T>
   static void copyChars(T* destination,
                         const T* source,
                         unsigned numCharacters) {
     memcpy(destination, source, numCharacters * sizeof(T));
@@ skipping 166 matching lines @@
   template <class UCharPredicate>
   PassRefPtr<StringImpl> stripMatchedCharacters(UCharPredicate);
   template <typename CharType, class UCharPredicate>
   PassRefPtr<StringImpl> simplifyMatchedCharactersToSpace(UCharPredicate,
                                                           StripBehavior);
   NEVER_INLINE unsigned hashSlowCase() const;
 
   void destroyIfNotStatic() const;
   void updateContainsOnlyASCII() const;
 
-  // TODO(meade): Revert this by 17 Mar 17.
-  // This is for investigating crbug.com/694520
-  // #if DCHECK_IS_ON()
+#if DCHECK_IS_ON()
   std::string asciiForDebugging() const;
-// #endif
+#endif
 
 #ifdef STRING_STATS
   static StringStats m_stringStats;
 #endif
 
   static unsigned m_highestStaticStringLength;
 
 #if DCHECK_IS_ON()
   void assertHashIsCorrect() {
     DCHECK(hasHash());
     DCHECK_EQ(existingHash(), StringHasher::computeHashAndMaskTop8Bits(
                                   characters8(), length()));
   }
 #endif
 
  private:
-  // TODO(meade): Revert this by 17 Mar 17.
-  // This is for investigating crbug.com/694520
-  // #if DCHECK_IS_ON()
+#if DCHECK_IS_ON()
   mutable ThreadRestrictionVerifier m_verifier;
-  // #endif
+#endif
   mutable unsigned m_refCount;
   const unsigned m_length;
   mutable unsigned m_hash : 24;
   mutable unsigned m_containsOnlyASCII : 1;
   mutable unsigned m_needsASCIICheck : 1;
   unsigned m_isAtomic : 1;
   const unsigned m_is8Bit : 1;
   const unsigned m_isStatic : 1;
 };
 
@@ skipping 342 matching lines @@
 using WTF::TextCaseASCIIInsensitive;
 using WTF::TextCaseUnicodeInsensitive;
 using WTF::TextCaseSensitive;
 using WTF::TextCaseSensitivity;
 using WTF::equal;
 using WTF::equalNonNull;
 using WTF::lengthOfNullTerminatedString;
 using WTF::reverseFind;
 
 #endif