GPU: Factory produces APTManagers instead of APTDelegates

gpu/command_buffer/service/async_pixel_transfer_manager.h

Index: gpu/command_buffer/service/async_pixel_transfer_manager.h
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager.h b/gpu/command_buffer/service/async_pixel_transfer_manager.h
index 2f6109943391505e1272149ada6a4b3d9036bbc7..21f3980b44398105f9be074bc265d174391ab676 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager.h
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager.h
@@ -36,18 +36,13 @@ struct AsyncTexImage2DParams;
 class GPU_EXPORT AsyncPixelTransferManager
     : public gles2::TextureManager::DestructionObserver {
  public:
-  AsyncPixelTransferManager(gles2::TextureManager* texture_manager_,
-                            gfx::GLContext* context);
+  static AsyncPixelTransferManager* Create(gfx::GLContext* context);
+
   virtual ~AsyncPixelTransferManager();
 
-  AsyncPixelTransferDelegate* GetAsyncPixelTransferDelegate() {
-    return delegate_.get();
-  }
+  void Initialize(gles2::TextureManager* texture_manager);
 
-  void SetAsyncPixelTransferDelegateForTest(
-      AsyncPixelTransferDelegate* delegate) {
-    delegate_ = make_scoped_ptr(delegate);
-  }
+  virtual AsyncPixelTransferDelegate* GetAsyncPixelTransferDelegate() = 0;
 
   AsyncPixelTransferState* CreatePixelTransferState(
       gles2::TextureRef* ref,
@@ -65,11 +60,12 @@ class GPU_EXPORT AsyncPixelTransferManager
       OVERRIDE;
   virtual void OnTextureRefDestroying(gles2::TextureRef* texture) OVERRIDE;
 
+ protected:
+  AsyncPixelTransferManager();
+
  private:
   gles2::TextureManager* manager_;
 
-  scoped_ptr<AsyncPixelTransferDelegate> delegate_;
-
   typedef base::hash_map<gles2::TextureRef*,
                          scoped_refptr<AsyncPixelTransferState> >
       TextureToStateMap;