Re-land: gin: Use V8 Maybe APIs

gin/shell_runner.cc

 // Copyright 2014 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 "gin/shell_runner.h"
 
 #include "gin/converter.h"
 #include "gin/modules/module_registry.h"
 #include "gin/per_context_data.h"
 #include "gin/public/context_holder.h"
@@ skipping 47 matching lines @@
 
   v8::Context::Scope scope(context);
   delegate_->DidCreateContext(this);
 }
 
 ShellRunner::~ShellRunner() {
 }
 
 void ShellRunner::Run(const std::string& source,
                       const std::string& resource_name) {
-  TryCatch try_catch;
   v8::Isolate* isolate = GetContextHolder()->isolate();
-  v8::Local<Script> script = Script::Compile(
-      StringToV8(isolate, source), StringToV8(isolate, resource_name));
-  if (try_catch.HasCaught()) {
+  TryCatch try_catch(isolate);
+  v8::ScriptOrigin origin(StringToV8(isolate, resource_name));
+  auto maybe_script = Script::Compile(GetContextHolder()->context(),
+                                      StringToV8(isolate, source), &origin);
+  v8::Local<Script> script;
+  if (!maybe_script.ToLocal(&script)) {
     delegate_->UnhandledException(this, try_catch);
     return;
   }
 
   Run(script);
 }
 
 v8::Local<v8::Value> ShellRunner::Call(v8::Local<v8::Function> function,
                                         v8::Local<v8::Value> receiver,
                                         int argc,
                                         v8::Local<v8::Value> argv[]) {
-  TryCatch try_catch;
+  TryCatch try_catch(GetContextHolder()->isolate());
   delegate_->WillRunScript(this);
 
-  v8::Local<v8::Value> result = function->Call(receiver, argc, argv);
+  auto maybe_result =
+      function->Call(GetContextHolder()->context(), receiver, argc, argv);
 
   delegate_->DidRunScript(this);
-  if (try_catch.HasCaught())
+  v8::Local<v8::Value> result;
+  if (!maybe_result.ToLocal(&result))
     delegate_->UnhandledException(this, try_catch);
 
   return result;
 }
 
 ContextHolder* ShellRunner::GetContextHolder() {
   return context_holder_.get();
 }
 
 void ShellRunner::Run(v8::Local<Script> script) {
-  TryCatch try_catch;
+  TryCatch try_catch(GetContextHolder()->isolate());
   delegate_->WillRunScript(this);
 
-  script->Run();
+  auto maybe = script->Run(GetContextHolder()->context());
 
   delegate_->DidRunScript(this);
-  if (try_catch.HasCaught()) {
+  v8::Local<v8::Value> result;
+  if (!maybe.ToLocal(&result)) {
     delegate_->UnhandledException(this, try_catch);
   }
 }
 
 }  // namespace gin