Revert r24085 and r24086, restoring skia asserts to debug-only....

skia/config/SkUserConfig.h

 /*
  * Copyright (C) 2006 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 58 matching lines @@
 
 /*  Skia has lots of debug-only code. Often this is just null checks or other
     parameter checking, but sometimes it can be quite intrusive (e.g. check that
     each 32bit pixel is in premultiplied form). This code can be very useful
     during development, but will slow things down in a shipping product.
  
     By default, these mutually exclusive flags are defined in SkPreConfig.h,
     based on the presence or absence of NDEBUG, but that decision can be changed
     here.
  */
-
-// Force SK_DEBUG even in release, so we get SkASSERTs.
-// TODO(senorblanco):  Remove this after a few reliability runs.
-#define SK_DEBUG
-#undef SK_RELEASE
+//#define SK_DEBUG
+//#define SK_RELEASE
 
 
 /*  If, in debugging mode, Skia needs to stop (presumably to invoke a debugger)
     it will call SK_CRASH(). If this is not defined it, it is defined in
     SkPostConfig.h to write to an illegal address
  */
 //#define SK_CRASH() *(int *)(uintptr_t)0 = 0
 
 
 /*  preconfig will have attempted to determine the endianness of the system,
@@ skipping 112 matching lines @@
 // assertion.
 #define SK_CRASH() SkDebugf_FileLine(__FILE__, __LINE__, true, "SK_CRASH")
 
 // For now (and to avoid rebaselining 1700+ tests), we'll use the old version
 // of SkAlpha255To256.
 #define SK_USE_OLD_255_TO_256
 
 // ===== End Chrome-specific definitions =====
 
 #endif