| Index: cc/layer_tree_host_unittest.cc
|
| diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
|
| index 26a810e1c906d403c8505cafb5a320bdd50c43cc..a91304ebea6a401998bbdcbb87e1059cf15d30a6 100644
|
| --- a/cc/layer_tree_host_unittest.cc
|
| +++ b/cc/layer_tree_host_unittest.cc
|
| @@ -1429,7 +1429,7 @@ public:
|
| context->resetUsedTextures();
|
| break;
|
| default:
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| break;
|
| }
|
| }
|
| @@ -1551,7 +1551,7 @@ public:
|
| context->resetUsedTextures();
|
| break;
|
| default:
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| break;
|
| }
|
| }
|
| @@ -1596,7 +1596,7 @@ public:
|
| m_layerTreeHost->setViewportSize(IntSize(10, 20), IntSize(10, 20));
|
| break;
|
| default:
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| break;
|
| }
|
| }
|
| @@ -2508,7 +2508,7 @@ public:
|
| virtual ~EvictTexturesTask() { }
|
| virtual void run() OVERRIDE
|
| {
|
| - ASSERT(m_test->m_implForEvictTextures);
|
| + DCHECK(m_test->m_implForEvictTextures);
|
| m_test->m_implForEvictTextures->reduceContentsTextureMemoryOnImplThread(0);
|
| }
|
|
|
| @@ -2518,7 +2518,7 @@ public:
|
|
|
| void postEvictTextures()
|
| {
|
| - ASSERT(webThread());
|
| + DCHECK(webThread());
|
| webThread()->postTask(new EvictTexturesTask(this));
|
| }
|
|
|
| @@ -2568,7 +2568,7 @@ public:
|
| endTest();
|
| break;
|
| default:
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| break;
|
| }
|
| }
|
| @@ -2601,7 +2601,7 @@ public:
|
| postEvictTextures();
|
| break;
|
| default:
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| break;
|
| }
|
| }
|
| @@ -2665,8 +2665,8 @@ public:
|
|
|
| void evictTexturesOnImplThread()
|
| {
|
| - ASSERT(m_implForEvictTextures);
|
| - m_implForEvictTextures->reduceContentsTextureMemoryOnImplThread(0);
|
| + DCHECK(m_implForEvictTextures);
|
| + m_implForEvictTextures->reduceContentsTextureMemoryOnImplThread(0);
|
| }
|
|
|
| // Commit 1: Just commit and draw normally, then at the end, set ourselves
|
|
|