Merge bleeding_edge 17696:18016.

src/string-stream.cc

Index: src/string-stream.cc
diff --git a/src/string-stream.cc b/src/string-stream.cc
index 45b675fa8ba3bdc14df2517460af318c6308339c..e2d15f540562b7ec1d2b9b3cdf44cf8aa3f753b6 100644
--- a/src/string-stream.cc
+++ b/src/string-stream.cc
@@ -30,8 +30,6 @@
 #include "factory.h"
 #include "string-stream.h"
 
-#include "allocation-inl.h"
-
 namespace v8 {
 namespace internal {
 
@@ -299,8 +297,7 @@ Handle<String> StringStream::ToString(Isolate* isolate) {
 void StringStream::ClearMentionedObjectCache(Isolate* isolate) {
   isolate->set_string_stream_current_security_token(NULL);
   if (isolate->string_stream_debug_object_cache() == NULL) {
-    isolate->set_string_stream_debug_object_cache(
-        new List<HeapObject*, PreallocatedStorageAllocationPolicy>(0));
+    isolate->set_string_stream_debug_object_cache(new DebugObjectCache(0));
   }
   isolate->string_stream_debug_object_cache()->Clear();
 }