SkPDF: clean up overuse of SK_SUPPORT_PDF

tests/CanvasTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*  Description:
  *      This test defines a series of elementatry test steps that perform
  *      a single or a small group of canvas API calls. Each test step is
@@ skipping 550 matching lines @@
     REPORTER_ASSERT_MESSAGE(reporter, layerIter2.done(),
         testStep->assertMessage());
 
 }
 
 static void TestPdfDevice(skiatest::Reporter* reporter,
                           const TestData& d,
                           CanvasTestStep* testStep) {
     SkDynamicMemoryWStream outStream;
     SkAutoTUnref<SkDocument> doc(SkDocument::CreatePDF(&outStream));
-#if SK_SUPPORT_PDF
-    REPORTER_ASSERT(reporter, doc);
+    if (!doc) {
+        return;

[reed1, 2015/08/11 19:08:47]

Should we assert that we failed only when PDF was disabled?

[hal.canary, 2015/08/11 20:26:15]

Done.

+    }
     SkCanvas* canvas = doc->beginPage(SkIntToScalar(d.fWidth),
                                       SkIntToScalar(d.fHeight));
     REPORTER_ASSERT(reporter, canvas);
     testStep->setAssertMessageFormat(kPdfAssertMessageFormat);
     testStep->draw(canvas, d, reporter);
 
     REPORTER_ASSERT(reporter, doc->close());
-#else
-    REPORTER_ASSERT(reporter, !doc);
-#endif  // SK_SUPPORT_PDF
 }
 
 // The following class groups static functions that need to access
 // the privates members of SkDeferredCanvas
 class SkDeferredCanvasTester {
 public:
     static void TestDeferredCanvasStateConsistency(
         skiatest::Reporter* reporter,
         const TestData& d,
         CanvasTestStep* testStep,
@@ skipping 179 matching lines @@
     canvas.restore();
     canvas.save();
     path.moveTo(5, 5);
     canvas.clipPath(path);
     canvas.restore();
     canvas.save();
     path.moveTo(7, 7);
     canvas.clipPath(path);  // should not assert here
     canvas.restore();
 }