remove getter for imagegenerator factory, update test

include/core/SkGraphics.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGraphics_DEFINED
 #define SkGraphics_DEFINED
 
@@ skipping 132 matching lines @@
      *  global font cache.
      */
     static void SetTLSFontCacheLimit(size_t bytes);
 
     typedef SkImageGenerator* (*ImageGeneratorFromEncodedFactory)(SkData*);
 
     /**
      *  To instantiate images from encoded data, first looks at this runtime function-ptr. If it
      *  exists, it is called to create an SkImageGenerator from SkData. If there is no function-ptr
      *  or there is, but it returns NULL, then skia will call its internal default implementation.
+     *
+     *  Returns the previous factory (which could be NULL).
      */
-    static ImageGeneratorFromEncodedFactory GetImageGeneratorFromEncodedFactory();
-    static void SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory);
+    static ImageGeneratorFromEncodedFactory
+           SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory);
 };
 
 class SkAutoGraphics {
 public:
     SkAutoGraphics() {
         SkGraphics::Init();
     }
     ~SkAutoGraphics() {
         SkGraphics::Term();
     }
 };
 
 #endif