| Index: src/zone/zone-containers.h
 | 
| diff --git a/src/zone-containers.h b/src/zone/zone-containers.h
 | 
| similarity index 96%
 | 
| rename from src/zone-containers.h
 | 
| rename to src/zone/zone-containers.h
 | 
| index 2b7d110eaa70121bad08b0f03fd7f052e55f0a70..0aecd98e5043909f7a306c384b3b3aee34fe037d 100644
 | 
| --- a/src/zone-containers.h
 | 
| +++ b/src/zone/zone-containers.h
 | 
| @@ -2,8 +2,8 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#ifndef V8_ZONE_CONTAINERS_H_
 | 
| -#define V8_ZONE_CONTAINERS_H_
 | 
| +#ifndef V8_SRC_ZONE_ZONE_CONTAINERS_H_
 | 
| +#define V8_SRC_ZONE_ZONE_CONTAINERS_H_
 | 
|  
 | 
|  #include <deque>
 | 
|  #include <list>
 | 
| @@ -13,7 +13,7 @@
 | 
|  #include <stack>
 | 
|  #include <vector>
 | 
|  
 | 
| -#include "src/zone-allocator.h"
 | 
| +#include "src/zone/zone-allocator.h"
 | 
|  
 | 
|  namespace v8 {
 | 
|  namespace internal {
 | 
| @@ -38,7 +38,6 @@ class ZoneVector : public std::vector<T, zone_allocator<T>> {
 | 
|        : std::vector<T, zone_allocator<T>>(size, def, zone_allocator<T>(zone)) {}
 | 
|  };
 | 
|  
 | 
| -
 | 
|  // A wrapper subclass std::deque to make it easy to construct one
 | 
|  // that uses a zone allocator.
 | 
|  template <typename T>
 | 
| @@ -49,7 +48,6 @@ class ZoneDeque : public std::deque<T, zone_allocator<T>> {
 | 
|        : std::deque<T, zone_allocator<T>>(zone_allocator<T>(zone)) {}
 | 
|  };
 | 
|  
 | 
| -
 | 
|  // A wrapper subclass std::list to make it easy to construct one
 | 
|  // that uses a zone allocator.
 | 
|  // TODO(mstarzinger): This should be renamed to ZoneList once we got rid of our
 | 
| @@ -62,7 +60,6 @@ class ZoneLinkedList : public std::list<T, zone_allocator<T>> {
 | 
|        : std::list<T, zone_allocator<T>>(zone_allocator<T>(zone)) {}
 | 
|  };
 | 
|  
 | 
| -
 | 
|  // A wrapper subclass std::priority_queue to make it easy to construct one
 | 
|  // that uses a zone allocator.
 | 
|  template <typename T, typename Compare = std::less<T>>
 | 
| @@ -75,7 +72,6 @@ class ZonePriorityQueue
 | 
|                                                         ZoneVector<T>(zone)) {}
 | 
|  };
 | 
|  
 | 
| -
 | 
|  // A wrapper subclass for std::queue to make it easy to construct one
 | 
|  // that uses a zone allocator.
 | 
|  template <typename T>
 | 
| @@ -86,7 +82,6 @@ class ZoneQueue : public std::queue<T, ZoneDeque<T>> {
 | 
|        : std::queue<T, ZoneDeque<T>>(ZoneDeque<T>(zone)) {}
 | 
|  };
 | 
|  
 | 
| -
 | 
|  // A wrapper subclass for std::stack to make it easy to construct one that uses
 | 
|  // a zone allocator.
 | 
|  template <typename T>
 | 
| @@ -97,7 +92,6 @@ class ZoneStack : public std::stack<T, ZoneDeque<T>> {
 | 
|        : std::stack<T, ZoneDeque<T>>(ZoneDeque<T>(zone)) {}
 | 
|  };
 | 
|  
 | 
| -
 | 
|  // A wrapper subclass for std::set to make it easy to construct one that uses
 | 
|  // a zone allocator.
 | 
|  template <typename K, typename Compare = std::less<K>>
 | 
| @@ -109,7 +103,6 @@ class ZoneSet : public std::set<K, Compare, zone_allocator<K>> {
 | 
|                                                  zone_allocator<K>(zone)) {}
 | 
|  };
 | 
|  
 | 
| -
 | 
|  // A wrapper subclass for std::map to make it easy to construct one that uses
 | 
|  // a zone allocator.
 | 
|  template <typename K, typename V, typename Compare = std::less<K>>
 | 
| @@ -142,4 +135,4 @@ typedef ZoneVector<int> IntVector;
 | 
|  }  // namespace internal
 | 
|  }  // namespace v8
 | 
|  
 | 
| -#endif  // V8_ZONE_CONTAINERS_H_
 | 
| +#endif  // V8_SRC_ZONE_ZONE_CONTAINERS_H_
 | 
| 
 |