1 files changed, 14 insertions, 14 deletions
diff --git a/deps/v8/test/cctest/test-utils.cc b/deps/v8/test/cctest/test-utils.cc
index 1f5c7c6a70..628ed1ba4f 100644
--- a/deps/v8/test/cctest/test-utils.cc
+++ b/deps/v8/test/cctest/test-utils.cc
@@ -29,13 +29,13 @@
 
 #include <vector>
 
-#include "src/v8.h"
+#include "src/init/v8.h"
 
-#include "src/api-inl.h"
+#include "src/api/api-inl.h"
 #include "src/base/platform/platform.h"
-#include "src/collector.h"
-#include "src/conversions.h"
+#include "src/numbers/conversions.h"
 #include "test/cctest/cctest.h"
+#include "test/cctest/collector.h"
 
 namespace v8 {
 namespace internal {
@@ -79,7 +79,7 @@ TEST(Utils1) {
 
 
 TEST(BitSetComputer) {
-  typedef BitSetComputer<bool, 1, kSmiValueSize, uint32_t> BoolComputer;
+  using BoolComputer = BitSetComputer<bool, 1, kSmiValueSize, uint32_t>;
   CHECK_EQ(0, BoolComputer::word_count(0));
   CHECK_EQ(1, BoolComputer::word_count(8));
   CHECK_EQ(2, BoolComputer::word_count(50));
@@ -97,12 +97,12 @@ TEST(BitSetComputer) {
 
   // Lets store 2 bits per item with 3000 items and verify the values are
   // correct.
-  typedef BitSetComputer<unsigned char, 2, 8, unsigned char> TwoBits;
+  using TwoBits = BitSetComputer<unsigned char, 2, 8, unsigned char>;
   const int words = 750;
   CHECK_EQ(words, TwoBits::word_count(3000));
   const int offset = 10;
   Vector<unsigned char> buffer = Vector<unsigned char>::New(offset + words);
-  memset(buffer.start(), 0, sizeof(unsigned char) * buffer.length());
+  memset(buffer.begin(), 0, sizeof(unsigned char) * buffer.length());
   for (int i = 0; i < words; i++) {
     const int index = TwoBits::index(offset, i);
     unsigned char data = buffer[index];
@@ -123,20 +123,20 @@ TEST(SNPrintF) {
   // Make sure that strings that are truncated because of too small
   // buffers are zero-terminated anyway.
   const char* s = "the quick lazy .... oh forget it!";
-  int length = StrLength(s);
+  int length = static_cast<int>(strlen(s));
   for (int i = 1; i < length * 2; i++) {
     static const char kMarker = static_cast<char>(42);
     Vector<char> buffer = Vector<char>::New(i + 1);
     buffer[i] = kMarker;
-    int n = SNPrintF(Vector<char>(buffer.start(), i), "%s", s);
+    int n = SNPrintF(Vector<char>(buffer.begin(), i), "%s", s);
     CHECK(n <= i);
     CHECK(n == length || n == -1);
-    CHECK_EQ(0, strncmp(buffer.start(), s, i - 1));
+    CHECK_EQ(0, strncmp(buffer.begin(), s, i - 1));
     CHECK_EQ(kMarker, buffer[i]);
     if (i <= length) {
-      CHECK_EQ(i - 1, StrLength(buffer.start()));
+      CHECK_EQ(i - 1, strlen(buffer.begin()));
     } else {
-      CHECK_EQ(length, StrLength(buffer.start()));
+      CHECK_EQ(length, strlen(buffer.begin()));
     }
     buffer.Dispose();
   }
@@ -260,8 +260,8 @@ TEST(SequenceCollectorRegression) {
   collector.AddBlock(
       i::Vector<const char>("12345678901234567890123456789012", 32));
   i::Vector<char> seq = collector.EndSequence();
-  CHECK_EQ(0, strncmp("0123456789012345678901234567890123",
-                      seq.start(), seq.length()));
+  CHECK_EQ(0, strncmp("0123456789012345678901234567890123", seq.begin(),
+                      seq.length()));
 }