Index: cc/layer_tree_host_impl_unittest.cc |
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc |
index 029c2969407af2a6b4a0085e3d64f837b87874bc..26d806f0b3d84c5dce0ddfa58e1a0a637395c7e6 100644 |
--- a/cc/layer_tree_host_impl_unittest.cc |
+++ b/cc/layer_tree_host_impl_unittest.cc |
@@ -490,7 +490,7 @@ TEST_P(CCLayerTreeHostImplTest, implPinchZoom) |
initializeRendererAndDrawFrame(); |
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer(); |
- ASSERT(scrollLayer); |
+ DCHECK(scrollLayer); |
const float minPageScale = 1, maxPageScale = 4; |
const WebTransformationMatrix identityScaleTransform; |
@@ -543,7 +543,7 @@ TEST_P(CCLayerTreeHostImplTest, pinchGesture) |
initializeRendererAndDrawFrame(); |
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer(); |
- ASSERT(scrollLayer); |
+ DCHECK(scrollLayer); |
const float minPageScale = CCSettings::pageScalePinchZoomEnabled() ? 1 : 0.5; |
const float maxPageScale = 4; |
@@ -630,7 +630,7 @@ TEST_P(CCLayerTreeHostImplTest, pageScaleAnimation) |
initializeRendererAndDrawFrame(); |
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer(); |
- ASSERT(scrollLayer); |
+ DCHECK(scrollLayer); |
const float minPageScale = CCSettings::pageScalePinchZoomEnabled() ? 1 : 0.5; |
const float maxPageScale = 4; |
@@ -682,7 +682,7 @@ TEST_P(CCLayerTreeHostImplTest, inhibitScrollAndPageScaleUpdatesWhilePinchZoomin |
initializeRendererAndDrawFrame(); |
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer(); |
- ASSERT(scrollLayer); |
+ DCHECK(scrollLayer); |
const float minPageScale = CCSettings::pageScalePinchZoomEnabled() ? 1 : 0.5; |
const float maxPageScale = 4; |
@@ -751,7 +751,7 @@ TEST_P(CCLayerTreeHostImplTest, inhibitScrollAndPageScaleUpdatesWhileAnimatingPa |
initializeRendererAndDrawFrame(); |
CCLayerImpl* scrollLayer = m_hostImpl->rootScrollLayer(); |
- ASSERT(scrollLayer); |
+ DCHECK(scrollLayer); |
const float minPageScale = CCSettings::pageScalePinchZoomEnabled() ? 1 : 0.5; |
const float maxPageScale = 4; |
@@ -2616,7 +2616,7 @@ public: |
void createResources(CCResourceProvider* provider) |
{ |
- ASSERT(provider); |
+ DCHECK(provider); |
int pool = 0; |
IntSize size(10, 10); |
GC3Denum format = GraphicsContext3D::RGBA; |