Revert of Consolidate SK_CRASH and sk_throw into SK_ABORT

tests/CachedDataTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCachedData.h"
 #include "SkDiscardableMemoryPool.h"
 #include "Test.h"
@@ skipping 12 matching lines @@
                        int refcnt, CachedState cacheState, LockedState lockedState) {
     REPORTER_ASSERT(reporter, data->testing_only_getRefCnt() == refcnt);
     REPORTER_ASSERT(reporter, data->testing_only_isInCache() == (kInCache == cacheState));
     REPORTER_ASSERT(reporter, data->testing_only_isLocked() == (lockedState == kLocked));
 }
 
 static SkCachedData* make_data(size_t size, SkDiscardableMemoryPool* pool) {
     if (pool) {
         SkDiscardableMemory* dm = pool->create(size);
         // the pool "can" return null, but it shouldn't in these controlled conditions
-        SkASSERT_RELEASE(dm);
+        SK_ALWAYSBREAK(dm);
         return new SkCachedData(size, dm);
     } else {
         return new SkCachedData(sk_malloc_throw(size), size);
     }
 }
 
 // returns with the data locked by client and cache
 static SkCachedData* test_locking(skiatest::Reporter* reporter,
                                   size_t size, SkDiscardableMemoryPool* pool) {
     SkCachedData* data = make_data(size, pool);
@@ skipping 42 matching lines @@
 
         // test with cache as last owner
         data = test_locking(reporter, size, useDiscardable ? pool.get() : nullptr);
         check_data(reporter, data, 2, kInCache, kLocked);
         data->unref();
         check_data(reporter, data, 1, kInCache, kUnlocked);
         data->detachFromCacheAndUnref();
     }
 }