Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION

third_party/WebKit/Source/modules/indexeddb/IDBMetadata.h

 /*
  * 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
@@ skipping 21 matching lines @@
 #include "modules/indexeddb/IDBKeyPath.h"
 #include "public/platform/modules/indexeddb/WebIDBMetadata.h"
 #include "wtf/Allocator.h"
 #include "wtf/HashMap.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 struct IDBIndexMetadata {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     IDBIndexMetadata() { }
     IDBIndexMetadata(const String& name, int64_t id, const IDBKeyPath& keyPath, bool unique, bool multiEntry)
         : name(name)
         , id(id)
         , keyPath(keyPath)
         , unique(unique)
         , multiEntry(multiEntry) { }
     String name;
     int64_t id;
     IDBKeyPath keyPath;
     bool unique;
     bool multiEntry;
 
     static const int64_t InvalidId = -1;
 };
 
 struct IDBObjectStoreMetadata {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     IDBObjectStoreMetadata() { }
     IDBObjectStoreMetadata(const String& name, int64_t id, const IDBKeyPath& keyPath, bool autoIncrement, int64_t maxIndexId)
         : name(name)
         , id(id)
         , keyPath(keyPath)
         , autoIncrement(autoIncrement)
         , maxIndexId(maxIndexId)
     {
     }
     String name;
     int64_t id;
     IDBKeyPath keyPath;
     bool autoIncrement;
     int64_t maxIndexId;
 
     static const int64_t InvalidId = -1;
 
     typedef HashMap<int64_t, IDBIndexMetadata> IndexMap;
     IndexMap indexes;
 };
 
 struct IDBDatabaseMetadata {
-    DISALLOW_ALLOCATION();
+    DISALLOW_NEW();
     // FIXME: These can probably be collapsed into 0.
     enum {
         NoIntVersion = -1,
         DefaultIntVersion = 0
     };
 
     typedef HashMap<int64_t, IDBObjectStoreMetadata> ObjectStoreMap;
 
     IDBDatabaseMetadata()
         : intVersion(NoIntVersion)
@@ skipping 16 matching lines @@
     String version;
     int64_t intVersion;
     int64_t maxObjectStoreId;
 
     ObjectStoreMap objectStores;
 };
 
 }
 
 #endif // IDBMetadata_h