Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION

third_party/WebKit/Source/platform/heap/HeapTest.cpp

 /*
  * Copyright (C) 2013 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
@@ skipping 109 matching lines @@
     {
         return a == b;
     }
 
     static const bool safeToCompareToEmptyOrDeleted = false;
 };
 
 typedef std::pair<Member<IntWrapper>, WeakMember<IntWrapper>> StrongWeakPair;
 
 struct PairWithWeakHandling : public StrongWeakPair {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 
 public:
     // Regular constructor.
     PairWithWeakHandling(IntWrapper* one, IntWrapper* two)
         : StrongWeakPair(one, two)
     {
         ASSERT(one); // We use null first field to indicate empty slots in the hash table.
     }
 
     // The HashTable (via the HashTrait) calls this constructor with a
@@ skipping 1398 matching lines @@
 private:
     UseMixin()
     {
         s_traceCount = 0;
     }
 };
 
 int UseMixin::s_traceCount = 0;
 
 class VectorObject {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     VectorObject()
     {
         m_value = SimpleFinalizedObject::create();
     }
 
     DEFINE_INLINE_TRACE()
     {
         visitor->trace(m_value);
     }
 
 private:
     Member<SimpleFinalizedObject> m_value;
 };
 
 class VectorObjectInheritedTrace : public VectorObject { };
 
 class VectorObjectNoTrace {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     VectorObjectNoTrace()
     {
         m_value = SimpleFinalizedObject::create();
     }
 
 private:
     Member<SimpleFinalizedObject> m_value;
 };
 
 class TerminatedArrayItem {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     TerminatedArrayItem(IntWrapper* payload) : m_payload(payload), m_isLast(false) { }
 
     DEFINE_INLINE_TRACE() { visitor->trace(m_payload); }
 
     bool isLastInArray() const { return m_isLast; }
     void setLastInArray(bool value) { m_isLast = value; }
 
     IntWrapper* payload() const { return m_payload; }
 
@@ skipping 1260 matching lines @@
     EXPECT_EQ(1u, vectorUW2->size());
     EXPECT_EQ(2u, deque->size());
     EXPECT_EQ(1u, deque2->size());
     EXPECT_EQ(3u, dequeWU->size());
     EXPECT_EQ(1u, dequeWU2->size());
     EXPECT_EQ(3u, dequeUW->size());
     EXPECT_EQ(1u, dequeUW2->size());
 }
 
 class NonTrivialObject final {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     NonTrivialObject()
     {
     }
     explicit NonTrivialObject(int num)
     {
         m_deque.append(IntWrapper::create(num));
         m_vector.append(IntWrapper::create(num));
     }
     DEFINE_INLINE_TRACE()
@@ skipping 1244 matching lines @@
         dequeNoTrace.append(n1);
         dequeNoTrace.append(n2);
         preciselyCollectGarbage();
         EXPECT_EQ(2, SimpleFinalizedObject::s_destructorCalls);
     }
     preciselyCollectGarbage();
     EXPECT_EQ(8, SimpleFinalizedObject::s_destructorCalls);
 }
 
 class InlinedVectorObject {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     InlinedVectorObject()
     {
     }
     ~InlinedVectorObject()
     {
         s_destructorCalls++;
     }
     DEFINE_INLINE_TRACE()
     {
     }
 
     static int s_destructorCalls;
 };
 
 int InlinedVectorObject::s_destructorCalls = 0;
 
 class InlinedVectorObjectWithVtable {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     InlinedVectorObjectWithVtable()
     {
     }
     ~InlinedVectorObjectWithVtable()
     {
         s_destructorCalls++;
     }
     virtual void virtualMethod() { }
     DEFINE_INLINE_TRACE()
@@ skipping 1571 matching lines @@
     DEFINE_INLINE_TRACE() { TraceIfNeeded<T>::trace(visitor, m_obj); }
     T& obj() { return m_obj; }
     ~TraceIfNeededTester() { }
 private:
     TraceIfNeededTester() { }
     explicit TraceIfNeededTester(const T& obj) : m_obj(obj) { }
     T m_obj;
 };
 
 class PartObject {
-    DISALLOW_ALLOCATION();
+    DISALLOW_NEW();
 public:
     PartObject() : m_obj(SimpleObject::create()) { }
     DEFINE_INLINE_TRACE() { visitor->trace(m_obj); }
 private:
     Member<SimpleObject> m_obj;
 };
 
 TEST(HeapTest, TraceIfNeeded)
 {
     CountingVisitor visitor;
@@ skipping 329 matching lines @@
 private:
     explicit SimpleRefValue(int value)
         : m_value(value)
     {
     }
 
     int m_value;
 };
 
 class PartObjectWithRef {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     PartObjectWithRef(int i)
         : m_value(SimpleRefValue::create(i))
     {
     }
 
     int value() const { return m_value->value(); }
 
 private:
     RefPtr<SimpleRefValue> m_value;
@@ skipping 351 matching lines @@
     EXPECT_EQ(1u, vector2.size());
 // TODO(Oilpan): when Vector.h's contiguous container support no longer disables
 // Vector<>s with inline capacity, remove.
 #if !defined(ANNOTATE_CONTIGUOUS_CONTAINER)
     EXPECT_EQ(16u, vector1.capacity());
     EXPECT_EQ(16u, vector2.capacity());
 #endif
 }
 
 } // namespace blink