PDF: Correctly embed JPEG images directly into PDF output.

tests/PDFJpegEmbedTest.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 "SkDocument.h"
 #include "SkCanvas.h"
 #include "SkImageGenerator.h"
@@ skipping 63 matching lines @@
     SkBitmap bm2(bitmap_from_data(cmykData));
     canvas->drawBitmap(bm2, 0.0, 512.0, NULL);
 
     canvas->flush();
     document->endPage();
     document->close();
     SkAutoTUnref<SkData> pdfData(pdf.copyToData());
     SkASSERT(pdfData);
     pdf.reset();
 
-    // Test disabled, waiting on resolution to http://skbug.com/3180
-    // REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
+    REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
 
     // This JPEG uses a nonstandard colorspace - it can not be
     // embedded into the PDF directly.
     REPORTER_ASSERT(r, !is_subset_of(cmykData, pdfData));
-
-    // The following is for debugging purposes only.
-    const char* outputPath = getenv("SKIA_TESTS_PDF_JPEG_EMBED_OUTPUT_PATH");
-    if (outputPath) {
-        SkFILEWStream output(outputPath);
-        if (output.isValid()) {
-            output.write(pdfData->data(), pdfData->size());
-        }
-    }
 }