Removing deprecated constructors and setDevice from SkDeferredCanvas

bench/DeferredCanvasBench.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.
  */
 #include "SkBenchmark.h"
 #include "SkDeferredCanvas.h"
 #include "SkDevice.h"
 #include "SkString.h"
@@ skipping 11 matching lines @@
     };
 protected:
     virtual const char* onGetName() {
         return fName.c_str();
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         SkDevice *device = canvas->getDevice()->createCompatibleDevice(
             SkBitmap::kARGB_8888_Config, CANVAS_WIDTH, CANVAS_HEIGHT, false);
 
-        SkAutoTUnref<SkDeferredCanvas> deferredCanvas(
-#if SK_DEFERRED_CANVAS_USES_FACTORIES
-            SkDeferredCanvas::Create(device));
-#else
-            SkNEW_ARGS(SkDeferredCanvas, (device)));
-#endif
+        SkAutoTUnref<SkDeferredCanvas> deferredCanvas(SkDeferredCanvas::Create(device));
         device->unref();
 
         initDeferredCanvas(deferredCanvas);
 
         for (int i = 0; i < N; i++) {
             drawInDeferredCanvas(deferredCanvas);
         }
 
         finalizeDeferredCanvas(deferredCanvas);
         deferredCanvas->flush();
@@ skipping 62 matching lines @@
     typedef DeferredCanvasBench INHERITED;
     SimpleNotificationClient fNotificationClient;
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkBenchmark* Fact0(void* p) { return new DeferredRecordBench(p); }
 
 static BenchRegistry gReg0(Fact0);