Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 0 insertions, 104 deletions

diff --git a/Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp b/Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp
deleted file mode 100644
index 72aa15a30..000000000
--- a/Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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 "CachedImage.h"
-#include "MemoryInstrumentationImpl.h"
-#include <gtest/gtest.h>
-#include <wtf/MemoryInstrumentation.h>
-#include <wtf/OwnPtr.h>
-
-using namespace WebCore;
-
-using WTF::MemoryObjectInfo;
-using WTF::MemoryClassInfo;
-using WTF::MemoryObjectType;
-
-namespace {
-
-MemoryObjectType TestType = "TestType";
-
-class ImageObserverTestHelper {
-public:
-    ImageObserverTestHelper()
-        : m_cachedImage(adoptPtr(new CachedImage(0)))
-        , m_imageOberver(m_cachedImage.get())
-    {
-    }
-    void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
-    {
-        MemoryClassInfo info(memoryObjectInfo, this, TestType);
-        info.addMember(m_cachedImage);
-        info.addMember(m_imageOberver);
-    }
-
-    OwnPtr<CachedImage> m_cachedImage;
-    ImageObserver* m_imageOberver;
-};
-
-TEST(MemoryInstrumentationTest, ImageObserver)
-{
-    ImageObserverTestHelper helper;
-
-    class TestClient : public MemoryInstrumentationClientImpl {
-    public:
-        TestClient(const void* expectedPointer, const void* unexpectedPointer)
-            : m_expectedPointer(expectedPointer)
-            , m_unexpectedPointer(unexpectedPointer)
-            , m_expectedPointerFound(false)
-        {
-            EXPECT_NE(expectedPointer, unexpectedPointer);
-        }
-        virtual void countObjectSize(const void* pointer, MemoryObjectType type, size_t size) OVERRIDE
-        {
-            EXPECT_NE(m_unexpectedPointer, pointer);
-            if (m_expectedPointer == pointer)
-                m_expectedPointerFound = true;
-            MemoryInstrumentationClientImpl::countObjectSize(pointer, type, size);
-        }
-
-        bool expectedPointerFound() { return m_expectedPointerFound; }
-
-    private:
-        const void* m_expectedPointer;
-        const void* m_unexpectedPointer;
-        bool m_expectedPointerFound;
-    } client(helper.m_cachedImage.get(), helper.m_imageOberver);
-    MemoryInstrumentationImpl instrumentation(&client);
-    instrumentation.addRootObject(helper);
-    EXPECT_TRUE(client.expectedPointerFound());
-    EXPECT_LE(sizeof(CachedImage), client.reportedSizeForAllTypes());
-    EXPECT_LE(1u, client.totalCountedObjects());
-}
-
-
-} // namespace
-