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

gpu/command_buffer/service/async_pixel_transfer_delegate_mock.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GL_ASYNC_TASK_DELEGATE_MOCK_H_
 #define UI_GL_ASYNC_TASK_DELEGATE_MOCK_H_
 
 #include "base/basictypes.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gl/async_pixel_transfer_delegate.h"
@@ skipping 14 matching lines @@
 };
 
 class MockAsyncPixelTransferDelegate : public gfx::AsyncPixelTransferDelegate {
  public:
   MockAsyncPixelTransferDelegate();
   virtual ~MockAsyncPixelTransferDelegate();
 
   // 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,
           const AsyncMemoryParams& mem_params));
   MOCK_METHOD3(AsyncTexSubImage2D,
       void(gfx::AsyncPixelTransferState*,
           const AsyncTexSubImage2DParams& tex_params,
           const AsyncMemoryParams& mem_params));
   MOCK_METHOD0(GetTextureUploadCount, uint32());
   MOCK_METHOD0(GetTotalTextureUploadTime, base::TimeDelta());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAsyncPixelTransferDelegate);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_ASYNC_TASK_DELEGATE_MOCK_H_