1 files changed, 4 insertions, 32 deletions
diff --git a/deps/v8/test/cctest/parsing/test-scanner.cc b/deps/v8/test/cctest/parsing/test-scanner.cc
index 56fe0ed83a..df1153793b 100644
--- a/deps/v8/test/cctest/parsing/test-scanner.cc
+++ b/deps/v8/test/cctest/parsing/test-scanner.cc
@@ -9,7 +9,6 @@
 #include "src/objects-inl.h"
 #include "src/parsing/scanner-character-streams.h"
 #include "src/parsing/scanner.h"
-#include "src/unicode-cache.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
@@ -22,11 +21,9 @@ const char src_simple[] = "function foo() { var x = 2 * a() + b; }";
 struct ScannerTestHelper {
   ScannerTestHelper() = default;
   ScannerTestHelper(ScannerTestHelper&& other) V8_NOEXCEPT
-      : unicode_cache(std::move(other.unicode_cache)),
-        stream(std::move(other.stream)),
+      : stream(std::move(other.stream)),
         scanner(std::move(other.scanner)) {}
 
-  std::unique_ptr<UnicodeCache> unicode_cache;
   std::unique_ptr<Utf16CharacterStream> stream;
   std::unique_ptr<Scanner> scanner;
 
@@ -36,10 +33,9 @@ struct ScannerTestHelper {
 
 ScannerTestHelper make_scanner(const char* src) {
   ScannerTestHelper helper;
-  helper.unicode_cache = std::unique_ptr<UnicodeCache>(new UnicodeCache);
   helper.stream = ScannerStream::ForTesting(src);
-  helper.scanner = std::unique_ptr<Scanner>(
-      new Scanner(helper.unicode_cache.get(), helper.stream.get(), false));
+  helper.scanner =
+      std::unique_ptr<Scanner>(new Scanner(helper.stream.get(), false));
   helper.scanner->Initialize();
   return helper;
 }
@@ -74,7 +70,7 @@ TEST(Bookmarks) {
 
     for (size_t i = 0; i < std::min(bookmark_pos + 10, tokens.size()); i++) {
       if (i == bookmark_pos) {
-        bookmark.Set();
+        bookmark.Set(scanner->peek_location().beg_pos);
       }
       CHECK_TOK(tokens[i], scanner->Next());
     }
@@ -107,29 +103,5 @@ TEST(AllThePushbacks) {
   }
 }
 
-TEST(ContextualKeywordTokens) {
-  auto scanner = make_scanner("function of get bla");
-
-  // function (regular keyword)
-  scanner->Next();
-  CHECK_TOK(Token::FUNCTION, scanner->current_token());
-  CHECK_TOK(Token::UNINITIALIZED, scanner->current_contextual_token());
-
-  // of (contextual keyword)
-  scanner->Next();
-  CHECK_TOK(Token::IDENTIFIER, scanner->current_token());
-  CHECK_TOK(Token::OF, scanner->current_contextual_token());
-
-  // get (contextual keyword)
-  scanner->Next();
-  CHECK_TOK(Token::IDENTIFIER, scanner->current_token());
-  CHECK_TOK(Token::GET, scanner->current_contextual_token());
-
-  // bla (identfier, not any sort of keyword)
-  scanner->Next();
-  CHECK_TOK(Token::IDENTIFIER, scanner->current_token());
-  CHECK_TOK(Token::UNINITIALIZED, scanner->current_contextual_token());
-}
-
 }  // namespace internal
 }  // namespace v8