Revert of Consolidate SK_CRASH and sk_throw into SK_ABORT

src/device/xps/SkXPSDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
@@ skipping 2026 matching lines @@
 
 static int num_glyph_guess(SkPaint::TextEncoding encoding, const void* text, size_t byteLength) {
     switch (encoding) {
     case SkPaint::kUTF8_TextEncoding:
         return SkUTF8_CountUnichars(static_cast<const char *>(text), byteLength);
     case SkPaint::kUTF16_TextEncoding:
         return SkUTF16_CountUnichars(static_cast<const uint16_t *>(text), SkToInt(byteLength));
     case SkPaint::kGlyphID_TextEncoding:
         return SkToInt(byteLength / 2);
     default:
-        SK_ABORT("Invalid Text Encoding");
+        SK_ALWAYSBREAK(true);
     }
     return 0;
 }
 
 static bool text_must_be_pathed(const SkPaint& paint, const SkMatrix& matrix) {
     const SkPaint::Style style = paint.getStyle();
     return matrix.hasPerspective()
         || SkPaint::kStroke_Style == style
         || SkPaint::kStrokeAndFill_Style == style
         || paint.getMaskFilter()
@@ skipping 189 matching lines @@
          "Could not get current visuals for layer.");
     HRVM(currentVisuals->Append(that->fCurrentXpsCanvas.get()),
          "Could not add layer to current visuals.");
 }
 
 SkBaseDevice* SkXPSDevice::onCreateDevice(const CreateInfo& info, const SkPaint*) {
 //Conditional for bug compatibility with PDF device.
 #if 0
     if (SkBaseDevice::kGeneral_Usage == info.fUsage) {
         return nullptr;
+        SK_CRASH();
         //To what stream do we write?
         //SkXPSDevice* dev = new SkXPSDevice(this);
         //SkSize s = SkSize::Make(width, height);
         //dev->BeginCanvas(s, s, SkMatrix::I());
         //return dev;
     }
 #endif
     return new SkXPSDevice(this->fXpsFactory.get());
 }
 
 #endif//defined(SK_BUILD_FOR_WIN32)