Clean up SK_PICTURE_USE_SK_RECORD and SK_PICTURE_OPTIMIZE_SK_RECORD.

include/core/SkPictureRecorder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureRecorder_DEFINED
 #define SkPictureRecorder_DEFINED
 
@@ skipping 31 matching lines @@
         @param height the height of the cull rect used when recording this picture.
         @param bbhFactory factory to create desired acceleration structure
         @param recordFlags optional flags that control recording.
         @return the canvas.
     */
     SkCanvas* beginRecording(SkScalar width, SkScalar height,
                              SkBBHFactory* bbhFactory = NULL,
                              uint32_t recordFlags = 0);
 
     // As usual, we have a deprecated old version and a maybe almost working
-    // new version.  We currently point beginRecording() to
-    // DEPRECATED_beginRecording() unless SK_PICTURE_USE_SK_RECORD is defined,
-    // then we use EXPERIMENTAL_beginRecording().
+    // new version.  We currently point beginRecording() to EXPERIMENTAL_beginRecording().
 
     // Old slower backend.
     SkCanvas* DEPRECATED_beginRecording(SkScalar width, SkScalar height,
                                         SkBBHFactory* bbhFactory = NULL,
                                         uint32_t recordFlags = 0);
 
     // New faster backend.
     SkCanvas* EXPERIMENTAL_beginRecording(SkScalar width, SkScalar height,
                                           SkBBHFactory* bbhFactory = NULL);
 
@@ skipping 37 matching lines @@
     SkAutoTUnref<SkPictureRecord> fPictureRecord;  // beginRecording()
     SkAutoTUnref<SkRecorder>      fRecorder;       // EXPERIMENTAL_beginRecording()
 
     // Used by EXPERIMENTAL_beginRecording().
     SkAutoTDelete<SkRecord> fRecord;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif