remove getter for imagegenerator factory, update test

tests/ImageGeneratorTest.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 "SkData.h"
 #include "SkGraphics.h"
 #include "SkImageGenerator.h"
 #include "Test.h"
 
-static SkImageGenerator* my_factory(SkData* data) {
-    int* ptr = *(int**)data->data();
-    *ptr = 1;   // signal that we were called
+static bool gMyFactoryWasCalled;
+
+static SkImageGenerator* my_factory(SkData*) {
+    gMyFactoryWasCalled = true;
     return NULL;
 }
 
 static void test_imagegenerator_factory(skiatest::Reporter* reporter) {
-    int factoryHasBeenCalled = 0;
-    int* sentinelPtr = &factoryHasBeenCalled;
-    SkData* data = SkData::NewWithCopy(&sentinelPtr, sizeof(sentinelPtr));
+    // just need a non-empty data to test things
+    SkData* data = SkData::NewWithCString("test_imagegenerator_factory");
+
+    gMyFactoryWasCalled = false;
 
     SkImageGenerator* gen;
-    REPORTER_ASSERT(reporter, 0 == *sentinelPtr);
+    REPORTER_ASSERT(reporter, !gMyFactoryWasCalled);
 
     gen = SkImageGenerator::NewFromEncoded(data);
     REPORTER_ASSERT(reporter, NULL == gen);
-    REPORTER_ASSERT(reporter, 0 == *sentinelPtr);
+    REPORTER_ASSERT(reporter, !gMyFactoryWasCalled);
 
     // Test is racy, in that it hopes no other thread is changing this global...
     SkGraphics::ImageGeneratorFromEncodedFactory prev =
-                                                SkGraphics::GetImageGeneratorFromEncodedFactory();
-    SkGraphics::SetImageGeneratorFromEncodedFactory(my_factory);
+                                    SkGraphics::SetImageGeneratorFromEncodedFactory(my_factory);
     gen = SkImageGenerator::NewFromEncoded(data);
     REPORTER_ASSERT(reporter, NULL == gen);
-    REPORTER_ASSERT(reporter, 1 == *sentinelPtr);
+    REPORTER_ASSERT(reporter, gMyFactoryWasCalled);
     SkGraphics::SetImageGeneratorFromEncodedFactory(prev);
 }
 
 class MyImageGenerator : public SkImageGenerator {
 public:
     MyImageGenerator() : SkImageGenerator(SkImageInfo::MakeN32Premul(0, 0)) {}
 };
 
 DEF_TEST(ImageGenerator, reporter) {
     MyImageGenerator ig;
@@ skipping 14 matching lines @@
     ig.getYUV8Planes(sizes, planes, rowBytes, &colorSpace);
 
     int dummy;
     planes[0] = planes[1] = planes[2] = &dummy;
     rowBytes[0] = rowBytes[1] = rowBytes[2] = 250;
 
     ig.getYUV8Planes(sizes, planes, rowBytes, &colorSpace);
 
     test_imagegenerator_factory(reporter);
 }