Use DEF_GM everywhere

gm/bitmaprect.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
@@ skipping 255 matching lines @@
         canvas->drawBitmapRect(fBM, r, nullptr);
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 DEF_GM( return new BitmapRectRounding; )
 
 //////////////////////////////////////////////////////////////////////////////
 
-static skiagm::GM* MyFactory0(void*) { return new DrawBitmapRect2(false); }
-static skiagm::GM* MyFactory1(void*) { return new DrawBitmapRect2(true); }
-
-static skiagm::GM* MyFactory2(void*) { return new DrawBitmapRect3(); }
+DEF_GM( return new DrawBitmapRect2(false); )
+DEF_GM( return new DrawBitmapRect2(true); )
+DEF_GM( return new DrawBitmapRect3(); )
 
 #ifndef SK_BUILD_FOR_ANDROID
-static skiagm::GM* MyFactory3(void*) { return new DrawBitmapRect4(false); }
-static skiagm::GM* MyFactory4(void*) { return new DrawBitmapRect4(true); }
+DEF_GM( return new DrawBitmapRect4(false); )
+DEF_GM( return new DrawBitmapRect4(true); )
 #endif
 
-static skiagm::GMRegistry reg0(MyFactory0);
-static skiagm::GMRegistry reg1(MyFactory1);
-
-static skiagm::GMRegistry reg2(MyFactory2);
-
-#ifndef SK_BUILD_FOR_ANDROID
-static skiagm::GMRegistry reg3(MyFactory3);
-static skiagm::GMRegistry reg4(MyFactory4);
-#endif
-