Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(994)

Unified Diff: test/cctest/parsing/test-scanner.cc

Issue 2468423008: Fix memory leak in test-scanner.cc. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/cctest/parsing/test-scanner.cc
diff --git a/test/cctest/parsing/test-scanner.cc b/test/cctest/parsing/test-scanner.cc
index 2577aa586888219ca43de8ed88b042f335b55d38..12884ba1067cc535e30cfe34e1f0abe6e897e0cd 100644
--- a/test/cctest/parsing/test-scanner.cc
+++ b/test/cctest/parsing/test-scanner.cc
@@ -17,8 +17,8 @@ namespace {
const char src_simple[] = "function foo() { var x = 2 * a() + b; }";
-std::unique_ptr<Scanner> make_scanner(const char* src) {
- std::unique_ptr<Scanner> scanner(new Scanner(new UnicodeCache()));
+std::unique_ptr<Scanner> make_scanner(const char* src, UnicodeCache* cache) {
+ std::unique_ptr<Scanner> scanner(new Scanner(cache));
scanner->Initialize(ScannerStream::ForTesting(src).release());
return scanner;
}
@@ -30,11 +30,13 @@ std::unique_ptr<Scanner> make_scanner(const char* src) {
#define DCHECK_TOK(a, b) DCHECK_EQ(Token::Name(a), Token::Name(b))
TEST(Bookmarks) {
+ UnicodeCache unicode_cache;
+
// Scan through the given source and record the tokens for use as reference
// below.
std::vector<Token::Value> tokens;
{
- auto scanner = make_scanner(src_simple);
+ auto scanner = make_scanner(src_simple, &unicode_cache);
do {
tokens.push_back(scanner->Next());
} while (scanner->current_token() != Token::EOS);
@@ -48,7 +50,7 @@ TEST(Bookmarks) {
// - scan until the end.
// At each step, compare to the reference token sequence generated above.
for (size_t bookmark_pos = 0; bookmark_pos < tokens.size(); bookmark_pos++) {
- auto scanner = make_scanner(src_simple);
+ auto scanner = make_scanner(src_simple, &unicode_cache);
Scanner::BookmarkScope bookmark(scanner.get());
for (size_t i = 0; i < std::min(bookmark_pos + 10, tokens.size()); i++) {
@@ -77,8 +79,9 @@ TEST(AllThePushbacks) {
{"<!-- xx -->\nx", {Token::IDENTIFIER, Token::EOS}},
};
+ UnicodeCache unicode_cache;
for (const auto& test_case : test_cases) {
- auto scanner = make_scanner(test_case.src);
+ auto scanner = make_scanner(test_case.src, &unicode_cache);
for (size_t i = 0; test_case.tokens[i] != Token::EOS; i++) {
DCHECK_TOK(test_case.tokens[i], scanner->Next());
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698