Re-land: Mark async texture uploads as completed from the upload thread.

gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h

Index: gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h
diff --git a/gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h b/gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h
index 4f44f7ad62c3c1f7e86dd2244fddefcfbe636594..9e2b4b32db4187fbbb2ad8abacfaf6543d3f04ac 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h
+++ b/gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h
@@ -32,8 +32,9 @@ class MockAsyncPixelTransferDelegate : public gfx::AsyncPixelTransferDelegate {
   // Implement AsyncPixelTransferDelegate.
   MOCK_METHOD1(CreateRawPixelTransferState,
       gfx::AsyncPixelTransferState*(GLuint service_id));
-  MOCK_METHOD1(AsyncNotifyCompletion,
-      void(const base::Closure& task));
+  MOCK_METHOD2(AsyncNotifyCompletion,
+      void(const AsyncMemoryParams& mem_params,
+           uint32 submit_count));

[epenner, 2013/02/07 20:22:56]

It was a bit unclear to me before what submit_count meant, and it's even less
clear in this context. Could there be a better name?

[reveman, 2013/02/07 21:30:52]

this is what the query system uses for the value that should  be written to the
shared memory at query completion. I wouldn't want to change it unless we change
all of the query system.

   MOCK_METHOD3(AsyncTexImage2D,
       void(gfx::AsyncPixelTransferState*,
           const AsyncTexImage2DParams& tex_params,