Use the blink main thread isolate for v8 unit tests.

chrome/test/base/v8_unit_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/v8_unit_test.h"
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/common/chrome_paths.h"
+#include "third_party/WebKit/public/web/WebKit.h"
 
 namespace {
 
 // |args| are passed through the various JavaScript logging functions such as
 // console.log. Returns a string appropriate for logging with LOG(severity).
 std::string LogArgs2String(const v8::FunctionCallbackInfo<v8::Value>& args) {
   std::string message;
   bool first = true;
   for (int i = 0; i < args.Length(); i++) {
     v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
@@ skipping 15 matching lines @@
 bool testResult_ok = false;
 
 // Location of test data (currently test/data/webui).
 base::FilePath test_data_directory;
 
 // Location of generated test data (<(PROGRAM_DIR)/test_data).
 base::FilePath gen_test_data_directory;
 
 }  // namespace
 
-V8UnitTest::V8UnitTest() : handle_scope_(isolate_scope_.isolate()) {
+V8UnitTest::V8UnitTest() : handle_scope_(blink::mainThreadIsolate()) {
   InitPathsAndLibraries();
 }
 
 V8UnitTest::~V8UnitTest() {
 }
 
 void V8UnitTest::AddLibrary(const base::FilePath& library_path) {
   user_libraries_.push_back(library_path);
 }
 
@@ skipping 24 matching lines @@
 }
 
 bool V8UnitTest::RunJavascriptTestF(const std::string& testFixture,
                                     const std::string& testName) {
   had_errors = false;
   testResult_ok = false;
   std::string test_js;
   if (!ExecuteJavascriptLibraries())
     return false;
 
-  v8::HandleScope handle_scope(isolate());
+  v8::Isolate* isolate = blink::mainThreadIsolate();
+  v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Context> context =
-      v8::Local<v8::Context>::New(isolate(), context_);
+      v8::Local<v8::Context>::New(isolate, context_);
   v8::Context::Scope context_scope(context);
 
   v8::Handle<v8::Value> functionProperty =
-      context->Global()->Get(v8::String::NewFromUtf8(isolate(), "runTest"));
+      context->Global()->Get(v8::String::NewFromUtf8(isolate, "runTest"));
   EXPECT_FALSE(functionProperty.IsEmpty());
   if (::testing::Test::HasNonfatalFailure())
     return false;
   EXPECT_TRUE(functionProperty->IsFunction());
   if (::testing::Test::HasNonfatalFailure())
     return false;
   v8::Handle<v8::Function> function =
       v8::Handle<v8::Function>::Cast(functionProperty);
 
-  v8::Local<v8::Array> params = v8::Array::New(isolate());
+  v8::Local<v8::Array> params = v8::Array::New(isolate);
   params->Set(0,
-              v8::String::NewFromUtf8(isolate(),
+              v8::String::NewFromUtf8(isolate,
                                       testFixture.data(),
                                       v8::String::kNormalString,
                                       testFixture.size()));
   params->Set(1,
-              v8::String::NewFromUtf8(isolate(),
+              v8::String::NewFromUtf8(isolate,
                                       testName.data(),
                                       v8::String::kNormalString,
                                       testName.size()));
   v8::Handle<v8::Value> args[] = {
-      v8::Boolean::New(isolate(), false),
-      v8::String::NewFromUtf8(isolate(), "RUN_TEST_F"), params};
+      v8::Boolean::New(isolate, false),
+      v8::String::NewFromUtf8(isolate, "RUN_TEST_F"), params};
 
   v8::TryCatch try_catch;
   v8::Handle<v8::Value> result = function->Call(context->Global(), 3, args);
   // The test fails if an exception was thrown.
   EXPECT_FALSE(result.IsEmpty());
   if (::testing::Test::HasNonfatalFailure())
     return false;
 
   // Ok if ran successfully, passed tests, and didn't have console errors.
   return result->BooleanValue() && testResult_ok && !had_errors;
@@ skipping 22 matching lines @@
   AddLibrary(accessibilityAuditPath);
 
   base::FilePath testApiPath;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &testApiPath));
   testApiPath = testApiPath.AppendASCII("webui");
   testApiPath = testApiPath.AppendASCII("test_api.js");
   AddLibrary(testApiPath);
 }
 
 void V8UnitTest::SetUp() {
-  v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate());
-  v8::Handle<v8::String> logString = v8::String::NewFromUtf8(isolate(), "log");
+  v8::Isolate* isolate = blink::mainThreadIsolate();
+  v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate);
+  v8::Handle<v8::String> logString = v8::String::NewFromUtf8(isolate, "log");
   v8::Handle<v8::FunctionTemplate> logFunction =
-      v8::FunctionTemplate::New(isolate(), &V8UnitTest::Log);
+      v8::FunctionTemplate::New(isolate, &V8UnitTest::Log);
   global->Set(logString, logFunction);
 
   // Set up chrome object for chrome.send().
-  v8::Handle<v8::ObjectTemplate> chrome = v8::ObjectTemplate::New(isolate());
-  global->Set(v8::String::NewFromUtf8(isolate(), "chrome"), chrome);
-  chrome->Set(v8::String::NewFromUtf8(isolate(), "send"),
-              v8::FunctionTemplate::New(isolate(), &V8UnitTest::ChromeSend));
+  v8::Handle<v8::ObjectTemplate> chrome = v8::ObjectTemplate::New(isolate);
+  global->Set(v8::String::NewFromUtf8(isolate, "chrome"), chrome);
+  chrome->Set(v8::String::NewFromUtf8(isolate, "send"),
+              v8::FunctionTemplate::New(isolate, &V8UnitTest::ChromeSend));
 
   // Set up console object for console.log(), etc.
-  v8::Handle<v8::ObjectTemplate> console = v8::ObjectTemplate::New(isolate());
-  global->Set(v8::String::NewFromUtf8(isolate(), "console"), console);
+  v8::Handle<v8::ObjectTemplate> console = v8::ObjectTemplate::New(isolate);
+  global->Set(v8::String::NewFromUtf8(isolate, "console"), console);
   console->Set(logString, logFunction);
-  console->Set(v8::String::NewFromUtf8(isolate(), "info"), logFunction);
-  console->Set(v8::String::NewFromUtf8(isolate(), "warn"), logFunction);
-  console->Set(v8::String::NewFromUtf8(isolate(), "error"),
-               v8::FunctionTemplate::New(isolate(), &V8UnitTest::Error));
+  console->Set(v8::String::NewFromUtf8(isolate, "info"), logFunction);
+  console->Set(v8::String::NewFromUtf8(isolate, "warn"), logFunction);
+  console->Set(v8::String::NewFromUtf8(isolate, "error"),
+               v8::FunctionTemplate::New(isolate, &V8UnitTest::Error));
 
-  context_.Reset(isolate(), v8::Context::New(isolate(), NULL, global));
+  context_.Reset(isolate, v8::Context::New(isolate, NULL, global));
 }
 
 void V8UnitTest::SetGlobalStringVar(const std::string& var_name,
                                     const std::string& value) {
+  v8::Isolate* isolate = blink::mainThreadIsolate();
   v8::Local<v8::Context> context =
-      v8::Local<v8::Context>::New(isolate(), context_);
+      v8::Local<v8::Context>::New(isolate, context_);
   v8::Context::Scope context_scope(context);
   context->Global()->Set(
-      v8::String::NewFromUtf8(isolate(),
+      v8::String::NewFromUtf8(isolate,
                               var_name.c_str(),
                               v8::String::kNormalString,
                               var_name.length()),
       v8::String::NewFromUtf8(
-          isolate(), value.c_str(), v8::String::kNormalString, value.length()));
+          isolate, value.c_str(), v8::String::kNormalString, value.length()));
 }
 
 void V8UnitTest::ExecuteScriptInContext(const base::StringPiece& script_source,
                                         const base::StringPiece& script_name) {
-  v8::HandleScope handle_scope(isolate());
+  v8::Isolate* isolate = blink::mainThreadIsolate();
+  v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Context> context =
-      v8::Local<v8::Context>::New(isolate(), context_);
+      v8::Local<v8::Context>::New(isolate, context_);
   v8::Context::Scope context_scope(context);
   v8::Handle<v8::String> source =
-      v8::String::NewFromUtf8(isolate(),
+      v8::String::NewFromUtf8(isolate,
                               script_source.data(),
                               v8::String::kNormalString,
                               script_source.size());
   v8::Handle<v8::String> name =
-      v8::String::NewFromUtf8(isolate(),
+      v8::String::NewFromUtf8(isolate,
                               script_name.data(),
                               v8::String::kNormalString,
                               script_name.size());
 
   v8::TryCatch try_catch;
   v8::Handle<v8::Script> script = v8::Script::Compile(source, name);
   // Ensure the script compiled without errors.
   if (script.IsEmpty())
     FAIL() << ExceptionToString(try_catch);
 
@@ skipping 16 matching lines @@
     int colnum = message->GetStartColumn();
     str.append(base::StringPrintf(
         "%s:%i:%i %s\n", *filename, linenum, colnum, *exception));
     v8::String::Utf8Value sourceline(message->GetSourceLine());
     str.append(base::StringPrintf("%s\n", *sourceline));
   }
   return str;
 }
 
 void V8UnitTest::TestFunction(const std::string& function_name) {
-  v8::HandleScope handle_scope(isolate());
+  v8::Isolate* isolate = blink::mainThreadIsolate();
+  v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Context> context =
-      v8::Local<v8::Context>::New(isolate(), context_);
+      v8::Local<v8::Context>::New(isolate, context_);
   v8::Context::Scope context_scope(context);
 
   v8::Handle<v8::Value> functionProperty = context->Global()->Get(
-      v8::String::NewFromUtf8(isolate(), function_name.c_str()));
+      v8::String::NewFromUtf8(isolate, function_name.c_str()));
   ASSERT_FALSE(functionProperty.IsEmpty());
   ASSERT_TRUE(functionProperty->IsFunction());
   v8::Handle<v8::Function> function =
       v8::Handle<v8::Function>::Cast(functionProperty);
 
   v8::TryCatch try_catch;
   v8::Handle<v8::Value> result = function->Call(context->Global(), 0, NULL);
   // The test fails if an exception was thrown.
   if (result.IsEmpty())
     FAIL() << ExceptionToString(try_catch);
@@ skipping 27 matching lines @@
   v8::Handle<v8::Array> testResult(args[1].As<v8::Array>());
   EXPECT_EQ(2U, testResult->Length());
   if (::testing::Test::HasNonfatalFailure())
     return;
   testResult_ok = testResult->Get(0)->BooleanValue();
   if (!testResult_ok) {
     v8::String::Utf8Value message(testResult->Get(1));
     LOG(ERROR) << *message;
   }
 }