1 files changed, 10 insertions, 9 deletions
diff --git a/deps/v8/src/strings/string-stream.cc b/deps/v8/src/strings/string-stream.cc
index ed1939ae0f..67e361963d 100644
--- a/deps/v8/src/strings/string-stream.cc
+++ b/deps/v8/src/strings/string-stream.cc
@@ -6,12 +6,12 @@
 
 #include <memory>
 
+#include "src/base/vector.h"
 #include "src/handles/handles-inl.h"
 #include "src/logging/log.h"
 #include "src/objects/js-array-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/prototype.h"
-#include "src/utils/vector.h"
 
 namespace v8 {
 namespace internal {
@@ -85,7 +85,8 @@ static bool IsControlChar(char c) {
   }
 }
 
-void StringStream::Add(Vector<const char> format, Vector<FmtElm> elms) {
+void StringStream::Add(base::Vector<const char> format,
+                       base::Vector<FmtElm> elms) {
   // If we already ran out of space then return immediately.
   if (full()) return;
   int offset = 0;
@@ -97,7 +98,7 @@ void StringStream::Add(Vector<const char> format, Vector<FmtElm> elms) {
       continue;
     }
     // Read this formatting directive into a temporary buffer
-    EmbeddedVector<char, 24> temp;
+    base::EmbeddedVector<char, 24> temp;
     int format_length = 0;
     // Skip over the whole control character sequence until the
     // format element type
@@ -119,7 +120,7 @@ void StringStream::Add(Vector<const char> format, Vector<FmtElm> elms) {
       }
       case 'w': {
         DCHECK_EQ(FmtElm::LC_STR, current.type_);
-        Vector<const uc16> value = *current.data_.u_lc_str_;
+        base::Vector<const base::uc16> value = *current.data_.u_lc_str_;
         for (int i = 0; i < value.length(); i++)
           Put(static_cast<char>(value[i]));
         break;
@@ -149,9 +150,9 @@ void StringStream::Add(Vector<const char> format, Vector<FmtElm> elms) {
       case 'c':
       case 'X': {
         int value = current.data_.u_int_;
-        EmbeddedVector<char, 24> formatted;
+        base::EmbeddedVector<char, 24> formatted;
         int length = SNPrintF(formatted, temp.begin(), value);
-        Add(Vector<const char>(formatted.begin(), length));
+        Add(base::Vector<const char>(formatted.begin(), length));
         break;
       }
       case 'f':
@@ -168,7 +169,7 @@ void StringStream::Add(Vector<const char> format, Vector<FmtElm> elms) {
         } else if (std::isnan(value)) {
           Add("nan");
         } else {
-          EmbeddedVector<char, 28> formatted;
+          base::EmbeddedVector<char, 28> formatted;
           SNPrintF(formatted, temp.begin(), value);
           Add(formatted.begin());
         }
@@ -176,7 +177,7 @@ void StringStream::Add(Vector<const char> format, Vector<FmtElm> elms) {
       }
       case 'p': {
         void* value = current.data_.u_pointer_;
-        EmbeddedVector<char, 20> formatted;
+        base::EmbeddedVector<char, 20> formatted;
         SNPrintF(formatted, temp.begin(), value);
         Add(formatted.begin());
         break;
@@ -248,7 +249,7 @@ void StringStream::OutputToFile(FILE* out) {
 
 Handle<String> StringStream::ToString(Isolate* isolate) {
   return isolate->factory()
-      ->NewStringFromUtf8(Vector<const char>(buffer_, length_))
+      ->NewStringFromUtf8(base::Vector<const char>(buffer_, length_))
       .ToHandleChecked();
 }