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

Side by Side Diff: gin/shell_runner_unittest.cc

Issue 1011133006: Move V8 snapshot loading code from isolate_holder to gin/v8_startup_data.{h,cc}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix DEPS for Android Created 5 years, 9 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gin/shell_runner.h" 5 #include "gin/shell_runner.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "gin/array_buffer.h" 8 #include "gin/array_buffer.h"
9 #include "gin/converter.h" 9 #include "gin/converter.h"
10 #include "gin/public/isolate_holder.h" 10 #include "gin/public/isolate_holder.h"
11 #include "gin/v8_initializer.h"
11 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
12 13
13 #ifdef V8_USE_EXTERNAL_STARTUP_DATA 14 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
14 #include "gin/public/isolate_holder.h" 15 #include "gin/public/isolate_holder.h"
15 #endif 16 #endif
16 17
17 using v8::Isolate; 18 using v8::Isolate;
18 using v8::Object; 19 using v8::Object;
19 using v8::Script; 20 using v8::Script;
20 using v8::String; 21 using v8::String;
21 22
22 namespace gin { 23 namespace gin {
23 24
24 TEST(RunnerTest, Run) { 25 TEST(RunnerTest, Run) {
25 std::string source = "this.result = 'PASS';\n"; 26 std::string source = "this.result = 'PASS';\n";
26 27
27 #ifdef V8_USE_EXTERNAL_STARTUP_DATA 28 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
28 gin::IsolateHolder::LoadV8Snapshot(); 29 gin::V8Initializer::LoadV8Snapshot();
29 #endif 30 #endif
30 31
31 gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode, 32 gin::V8Initializer::Initialize(gin::V8Initializer::kStrictMode,
32 gin::ArrayBufferAllocator::SharedInstance()); 33 gin::ArrayBufferAllocator::SharedInstance());
33 gin::IsolateHolder instance; 34 gin::IsolateHolder instance;
34 35
35 ShellRunnerDelegate delegate; 36 ShellRunnerDelegate delegate;
36 Isolate* isolate = instance.isolate(); 37 Isolate* isolate = instance.isolate();
37 ShellRunner runner(&delegate, isolate); 38 ShellRunner runner(&delegate, isolate);
38 Runner::Scope scope(&runner); 39 Runner::Scope scope(&runner);
39 runner.Run(source, "test_data.js"); 40 runner.Run(source, "test_data.js");
40 41
41 std::string result; 42 std::string result;
42 EXPECT_TRUE(Converter<std::string>::FromV8(isolate, 43 EXPECT_TRUE(Converter<std::string>::FromV8(isolate,
43 runner.global()->Get(StringToV8(isolate, "result")), 44 runner.global()->Get(StringToV8(isolate, "result")),
44 &result)); 45 &result));
45 EXPECT_EQ("PASS", result); 46 EXPECT_EQ("PASS", result);
46 } 47 }
47 48
48 } // namespace gin 49 } // namespace gin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698