Revert of Add tests for trace wrappers

third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.h

Index: third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.h b/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.h
index f075b5a9c9e257f0968b8ca5fb018d71a033b971..f350c602afbe49d27795d4d93ae659500e64be23 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.h
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.h
@@ -30,17 +30,17 @@
         const void* object)
         : m_traceWrappersCallback(traceWrappersCallback)
         , m_heapObjectHeaderCallback(heapObjectHeaderCallback)
-        , m_rawObjectPointer(object)
+        , m_object(object)
     {
         DCHECK(m_traceWrappersCallback);
         DCHECK(m_heapObjectHeaderCallback);
-        DCHECK(m_rawObjectPointer);
+        DCHECK(m_object);
     }
 
     inline void traceWrappers(WrapperVisitor* visitor)
     {
-        if (m_rawObjectPointer) {
-            m_traceWrappersCallback(visitor, m_rawObjectPointer);
+        if (m_object) {
+            m_traceWrappersCallback(visitor, m_object);
         }
     }
 
@@ -50,35 +50,29 @@
      */
     inline bool isWrapperHeaderMarked()
     {
-        return !m_rawObjectPointer || heapObjectHeader()->isWrapperHeaderMarked();
-    }
-
-    /**
-     * Returns raw object pointer. Beware it doesn't necessarily point to the
-     * beginning of the object.
-     */
-    const void* rawObjectPointer() { return m_rawObjectPointer; }
+        return !m_object || heapObjectHeader()->isWrapperHeaderMarked();
+    }
 
 private:
     inline bool shouldBeInvalidated()
     {
-        return m_rawObjectPointer && !heapObjectHeader()->isMarked();
+        return m_object && !heapObjectHeader()->isMarked();
     }
 
     inline void invalidate()
     {
-        m_rawObjectPointer = nullptr;
+        m_object = nullptr;
     }
 
     inline const HeapObjectHeader* heapObjectHeader()
     {
-        DCHECK(m_rawObjectPointer);
-        return m_heapObjectHeaderCallback(m_rawObjectPointer);
+        DCHECK(m_object);
+        return m_heapObjectHeaderCallback(m_object);
     }
 
     void (*m_traceWrappersCallback)(const WrapperVisitor*, const void*);
     HeapObjectHeader* (*m_heapObjectHeaderCallback)(const void*);
-    const void* m_rawObjectPointer;
+    const void* m_object;
 };
 
 /**
@@ -157,10 +151,6 @@
     void markWrappersInAllWorlds(const ScriptWrappable*) const override;
     void markWrappersInAllWorlds(const void*) const override {}
 
-    WTF::Deque<WrapperMarkingData>* getMarkingDeque() { return &m_markingDeque; }
-    WTF::Deque<WrapperMarkingData>* getVerifierDeque() { return &m_verifierDeque; }
-    WTF::Vector<HeapObjectHeader*>* getHeadersToUnmark() { return &m_headersToUnmark; }
-
 private:
     /**
      * Is wrapper tracing currently in progress? True if TracePrologue has been