Revert "cc: Switch to Chromium DCHECKs LOGs"

cc/layer_tree_host_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCLayerTreeHost.h"
 
 #include "CCGraphicsContext.h"
 #include "CCLayerTreeHostImpl.h"
@@ skipping 1411 matching lines @@
             // Number of textures used for commit should still be one.
             EXPECT_EQ(1, context->numUsedTextures());
             // First texture should not have been used.
             EXPECT_FALSE(context->usedTexture(context->texture(0)));
             // New texture should have been used.
             EXPECT_TRUE(context->usedTexture(context->texture(1)));
 
             context->resetUsedTextures();
             break;
         default:
-            NOTREACHED();
+            ASSERT_NOT_REACHED();
             break;
         }
     }
 
     virtual void drawLayersOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
     {
         CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->context3D());
 
         // Number of textures used for draw should always be one.
         EXPECT_EQ(1, context->numUsedTextures());
@@ skipping 101 matching lines @@
 
             context->resetUsedTextures();
             break;
         case 4:
             // Number of textures used for commit should be one.
             EXPECT_EQ(1, context->numUsedTextures());
 
             context->resetUsedTextures();
             break;
         default:
-            NOTREACHED();
+            ASSERT_NOT_REACHED();
             break;
         }
     }
 
     virtual void drawLayersOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
     {
         CompositorFakeWebGraphicsContext3DWithTextureTracking* context = static_cast<CompositorFakeWebGraphicsContext3DWithTextureTracking*>(impl->context()->context3D());
 
         // Number of textures used for drawing should two except for frame 4
         // where the viewport only contains one layer.
@@ skipping 24 matching lines @@
             m_child->setNeedsDisplayRect(FloatRect(0, 0, 5, 5));
             break;
         case 3:
             m_child->setNeedsDisplay();
             m_layerTreeHost->setViewportSize(IntSize(10, 10), IntSize(10, 10));
             break;
         case 4:
             m_layerTreeHost->setViewportSize(IntSize(10, 20), IntSize(10, 20));
             break;
         default:
-            NOTREACHED();
+            ASSERT_NOT_REACHED();
             break;
         }
     }
 
     virtual void afterTest() OVERRIDE
     {
     }
 
 private:
     MockContentLayerChromiumClient m_client;
@@ skipping 889 matching lines @@
         WebTransformationMatrix identityMatrix;
         setLayerPropertiesForTesting(m_layer.get(), 0, identityMatrix, FloatPoint(0, 0), FloatPoint(0, 0), IntSize(10, 20), true);
     }
 
     class EvictTexturesTask : public WebKit::WebThread::Task {
     public:
         EvictTexturesTask(CCLayerTreeHostTestEvictTextures* test) : m_test(test) { }
         virtual ~EvictTexturesTask() { }
         virtual void run() OVERRIDE
         {
-            DCHECK(m_test->m_implForEvictTextures);
+            ASSERT(m_test->m_implForEvictTextures);
             m_test->m_implForEvictTextures->releaseContentsTextures();
         }
 
     private:
         CCLayerTreeHostTestEvictTextures* m_test;
     };
 
     void postEvictTextures()
     {
-        DCHECK(webThread());
+        ASSERT(webThread());
         webThread()->postTask(new EvictTexturesTask(this));
     }
 
     // Commit 1: Just commit and draw normally, then post an eviction at the end
     // that will trigger a commit.
     // Commit 2: Triggered by the eviction, let it go through and then set
     // needsCommit.
     // Commit 3: Triggered by the setNeedsCommit. In layout(), post an eviction
     // task, which will be handled before the commit. Don't set needsCommit, it
     // should have been posted. A frame should not be drawn (note,
@@ skipping 29 matching lines @@
             EXPECT_TRUE(m_layer->haveBackingTexture());
             m_layerTreeHost->setNeedsCommit();
             break;
         case 5:
             break;
         case 6:
             EXPECT_TRUE(m_layer->haveBackingTexture());
             endTest();
             break;
         default:
-            NOTREACHED();
+            ASSERT_NOT_REACHED();
             break;
         }
     }
 
     virtual void commitCompleteOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
     {
         m_implForEvictTextures = impl;
     }
 
     virtual void layout() OVERRIDE
@@ skipping 12 matching lines @@
             break;
         case 5:
             postEvictTextures();
             break;
         case 6:
             // We couldn't check in didCommitAndDrawFrame on commit 5, so check here.
             EXPECT_FALSE(m_layer->haveBackingTexture());
             postEvictTextures();
             break;
         default:
-            NOTREACHED();
+            ASSERT_NOT_REACHED();
             break;
         }
     }
 
     virtual void afterTest() OVERRIDE
     {
     }
 
 private:
     MockContentLayerChromiumClient m_client;
@@ skipping 43 matching lines @@
         if (webThread())
             webThread()->postTask(new EvictTexturesTask(this));
         else {
             DebugScopedSetImplThread impl;
             evictTexturesOnImplThread();
         }
     }
 
     void evictTexturesOnImplThread()
     {
-        DCHECK(m_implForEvictTextures);
+        ASSERT(m_implForEvictTextures);
         m_implForEvictTextures->releaseContentsTextures();
     }
 
     // Commit 1: Just commit and draw normally, then at the end, set ourselves
     // invisible (to prevent a commit that would recreate textures after
     // eviction, before the context recovery), and post a task that will evict
     // textures, then cause the context to be lost, and then set ourselves
     // visible again (to allow commits, since that's what causes context
     // recovery in single thread).
     virtual void didCommitAndDrawFrame() OVERRIDE
@@ skipping 289 matching lines @@
     int m_numCommitComplete;
     int m_numDrawLayers;
 };
 
 TEST_F(CCLayerTreeHostTestContinuousAnimate, runMultiThread)
 {
     runTest(true);
 }
 
 } // namespace