Index: cc/resources/resource_update_controller_unittest.cc |
diff --git a/cc/resources/resource_update_controller_unittest.cc b/cc/resources/resource_update_controller_unittest.cc |
index 361050de6c76177dc5954bc762caf9cbbdadf477..49f7b47ac02230977eff913560223d46f411a3d3 100644 |
--- a/cc/resources/resource_update_controller_unittest.cc |
+++ b/cc/resources/resource_update_controller_unittest.cc |
@@ -32,20 +32,19 @@ class WebGraphicsContext3DForUploadTest : public TestWebGraphicsContext3D { |
explicit WebGraphicsContext3DForUploadTest(ResourceUpdateControllerTest* test) |
: test_(test) {} |
- virtual void flush() override; |
- virtual void shallowFlushCHROMIUM() override; |
- virtual void texSubImage2D(GLenum target, |
- GLint level, |
- GLint xoffset, |
- GLint yoffset, |
- GLsizei width, |
- GLsizei height, |
- GLenum format, |
- GLenum type, |
- const void* pixels) override; |
- |
- virtual void getQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* value) |
- override; |
+ void flush() override; |
+ void shallowFlushCHROMIUM() override; |
+ void texSubImage2D(GLenum target, |
+ GLint level, |
+ GLint xoffset, |
+ GLint yoffset, |
+ GLsizei width, |
+ GLsizei height, |
+ GLenum format, |
+ GLenum type, |
+ const void* pixels) override; |
+ |
+ void getQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* value) override; |
private: |
ResourceUpdateControllerTest* test_; |
@@ -329,7 +328,7 @@ class FakeResourceUpdateControllerClient |
void Reset() { ready_to_finalize_called_ = false; } |
bool ReadyToFinalizeCalled() const { return ready_to_finalize_called_; } |
- virtual void ReadyToFinalizeTextureUpdates() override { |
+ void ReadyToFinalizeTextureUpdates() override { |
ready_to_finalize_called_ = true; |
} |
@@ -353,7 +352,7 @@ class FakeResourceUpdateController : public ResourceUpdateController { |
void SetUpdateTextureTime(base::TimeDelta time) { |
update_textures_time_ = time; |
} |
- virtual base::TimeTicks UpdateMoreTexturesCompletionTime() override { |
+ base::TimeTicks UpdateMoreTexturesCompletionTime() override { |
size_t total_updates = |
resource_provider_->NumBlockingUploads() + update_more_textures_size_; |
return now_ + total_updates * update_textures_time_; |
@@ -361,7 +360,7 @@ class FakeResourceUpdateController : public ResourceUpdateController { |
void SetUpdateMoreTexturesSize(size_t size) { |
update_more_textures_size_ = size; |
} |
- virtual size_t UpdateMoreTexturesSize() const override { |
+ size_t UpdateMoreTexturesSize() const override { |
return update_more_textures_size_; |
} |