| Index: cc/layers/scrollbar_layer_unittest.cc
|
| diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
|
| index 44158d5805341388ec4d94b2ebe7d0b5eeed973f..c83da7ffc881793c8efd99d2982e5226ad0358d6 100644
|
| --- a/cc/layers/scrollbar_layer_unittest.cc
|
| +++ b/cc/layers/scrollbar_layer_unittest.cc
|
| @@ -578,7 +578,7 @@ class ScrollbarLayerTestMaxTextureSize : public LayerTreeTest {
|
|
|
| void SetScrollbarBounds(const gfx::Size& bounds) { bounds_ = bounds; }
|
|
|
| - virtual void BeginTest() OVERRIDE {
|
| + virtual void BeginTest() override {
|
| scroll_layer_ = Layer::Create();
|
| layer_tree_host()->root_layer()->AddChild(scroll_layer_);
|
|
|
| @@ -593,7 +593,7 @@ class ScrollbarLayerTestMaxTextureSize : public LayerTreeTest {
|
| PostSetNeedsCommitToMainThread();
|
| }
|
|
|
| - virtual void DidCommitAndDrawFrame() OVERRIDE {
|
| + virtual void DidCommitAndDrawFrame() override {
|
| const int kMaxTextureSize =
|
| layer_tree_host()->GetRendererCapabilities().max_texture_size;
|
|
|
| @@ -608,7 +608,7 @@ class ScrollbarLayerTestMaxTextureSize : public LayerTreeTest {
|
| EndTest();
|
| }
|
|
|
| - virtual void AfterTest() OVERRIDE {}
|
| + virtual void AfterTest() override {}
|
|
|
| private:
|
| scoped_refptr<PaintedScrollbarLayer> scrollbar_layer_;
|
| @@ -645,7 +645,7 @@ class FakeLayerTreeHost : public LayerTreeHost {
|
| InitializeSingleThreaded(client, base::MessageLoopProxy::current());
|
| }
|
|
|
| - virtual UIResourceId CreateUIResource(UIResourceClient* content) OVERRIDE {
|
| + virtual UIResourceId CreateUIResource(UIResourceClient* content) override {
|
| total_ui_resource_created_++;
|
| UIResourceId nid = next_id_++;
|
| ui_resource_bitmap_map_.insert(
|
| @@ -654,7 +654,7 @@ class FakeLayerTreeHost : public LayerTreeHost {
|
| }
|
|
|
| // Deletes a UI resource. May safely be called more than once.
|
| - virtual void DeleteUIResource(UIResourceId id) OVERRIDE {
|
| + virtual void DeleteUIResource(UIResourceId id) override {
|
| UIResourceBitmapMap::iterator iter = ui_resource_bitmap_map_.find(id);
|
| if (iter != ui_resource_bitmap_map_.end()) {
|
| ui_resource_bitmap_map_.erase(iter);
|
|
|