Fix unit test style in Source/platform/, part 2.

Source/platform/graphics/Canvas2DLayerManagerTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-
 #include "platform/graphics/Canvas2DLayerManager.h"
 
 #include "SkDevice.h"
 #include "SkSurface.h"
 #include "platform/graphics/test/MockWebGraphicsContext3D.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebGraphicsContext3DProvider.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "public/platform/WebUnitTestSupport.h"
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-using namespace blink;
 using testing::InSequence;
 using testing::Return;
 using testing::Test;
 
+namespace blink {
+
 namespace {
 
 class MockWebGraphicsContext3DProvider : public WebGraphicsContext3DProvider {
 public:
     MockWebGraphicsContext3DProvider(WebGraphicsContext3D* context3d)
         : m_context3d(context3d) { }
 
-    WebGraphicsContext3D* context3d()
+    WebGraphicsContext3D* context3d() override
     {
         return m_context3d;
     }
 
-    GrContext* grContext()
+    GrContext* grContext() override
     {
         return 0;
     }
 
 private:
     WebGraphicsContext3D* m_context3d;
 };
 
 class FakeCanvas2DLayerBridge : public Canvas2DLayerBridge {
 public:
     FakeCanvas2DLayerBridge(WebGraphicsContext3D* context, PassOwnPtr<SkDeferredCanvas> canvas, PassRefPtr<SkSurface> surface)
         : Canvas2DLayerBridge(adoptPtr(new MockWebGraphicsContext3DProvider(context)), canvas, surface, 0, NonOpaque)
         , m_freeableBytes(0)
         , m_freeMemoryIfPossibleCount(0)
         , m_flushCount(0)
     {
     }
 
-    virtual size_t storageAllocatedForRecording() override
+    size_t storageAllocatedForRecording() override
     {
         // Because the fake layer has no canvas to query, just
         // return status quo. Allocation changes that would normally be
         // initiated by the canvas can be faked by invoking
         // storageAllocatedForRecordingChanged directly from the test code.
         return m_bytesAllocated;
     }
 
     void fakeFreeableBytes(size_t size)
     {
         m_freeableBytes = size;
     }
 
-    virtual size_t freeMemoryIfPossible(size_t size) override
+    size_t freeMemoryIfPossible(size_t size) override
     {
         m_freeMemoryIfPossibleCount++;
         size_t bytesFreed = size < m_freeableBytes ? size : m_freeableBytes;
         m_freeableBytes -= bytesFreed;
         if (bytesFreed)
             storageAllocatedForRecordingChanged(m_bytesAllocated - bytesFreed);
         return bytesFreed;
     }
 
-    virtual void flush() override
+    void flush() override
     {
         flushedDrawCommands();
         m_freeableBytes = bytesAllocated();
         m_flushCount++;
     }
 
 public:
     size_t m_freeableBytes;
     int m_freeMemoryIfPossibleCount;
     int m_flushCount;
 };
 
 class FakeCanvas2DLayerBridgePtr {
 public:
     FakeCanvas2DLayerBridgePtr(PassRefPtr<FakeCanvas2DLayerBridge> layerBridge)
         : m_layerBridge(layerBridge) { }
 
     ~FakeCanvas2DLayerBridgePtr()
     {
         m_layerBridge->beginDestruction();
     }
 
     FakeCanvas2DLayerBridge* operator->() { return m_layerBridge.get(); }
     FakeCanvas2DLayerBridge* get() { return m_layerBridge.get(); }
 
 private:
     RefPtr<FakeCanvas2DLayerBridge> m_layerBridge;
 };
 
-} // unnamed namespace
+} // anonymous namespace
 
 class Canvas2DLayerManagerTest : public Test {
 protected:
     void storageAllocationTrackingTest()
     {
         Canvas2DLayerManager& manager = Canvas2DLayerManager::get();
         manager.init(10, 10);
         {
             OwnPtr<MockWebGraphicsContext3D> webContext = adoptPtr(new MockWebGraphicsContext3D);
             RefPtr<SkSurface> surface1 = adoptRef(SkSurface::NewRasterN32Premul(1, 1));
@@ skipping 111 matching lines @@
 
     class DeferredFrameTestTask : public WebThread::Task {
     public:
         DeferredFrameTestTask(Canvas2DLayerManagerTest* test, FakeCanvas2DLayerBridge* layer, bool skipCommands)
         {
             m_test = test;
             m_layer = layer;
             m_skipCommands = skipCommands;
         }
 
-        virtual void run() override
+        void run() override
         {
             m_test->doDeferredFrameTestTask(m_layer, m_skipCommands);
         }
+
     private:
         Canvas2DLayerManagerTest* m_test;
         FakeCanvas2DLayerBridge* m_layer;
         bool m_skipCommands;
     };
 
     void deferredFrameTest()
     {
         OwnPtr<MockWebGraphicsContext3D> webContext = adoptPtr(new MockWebGraphicsContext3D);
         Canvas2DLayerManager::get().init(10, 10);
@@ skipping 24 matching lines @@
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
         EXPECT_EQ(1, layer->m_flushCount);
 
         Platform::current()->currentThread()->postTask(FROM_HERE, new DeferredFrameTestTask(this, layer.get(), false));
         Platform::current()->unitTestSupport()->enterRunLoop();
         EXPECT_FALSE(Canvas2DLayerManager::get().m_taskObserverActive);
         EXPECT_EQ(2, layer->m_flushCount);
     }
 };
 
-namespace {
-
 TEST_F(Canvas2DLayerManagerTest, testStorageAllocationTracking)
 {
     storageAllocationTrackingTest();
 }
 
 TEST_F(Canvas2DLayerManagerTest, testEviction)
 {
     evictionTest();
 }
 
@@ skipping 10 matching lines @@
 TEST_F(Canvas2DLayerManagerTest, testHiddenCanvas)
 {
     hiddenCanvasTest();
 }
 
 TEST_F(Canvas2DLayerManagerTest, testAddRemoveLayer)
 {
     addRemoveLayerTest();
 }
 
-} // unnamed namespace
-
+} // namespace blink