| Index: extensions/renderer/object_backed_native_handler.cc
|
| diff --git a/extensions/renderer/object_backed_native_handler.cc b/extensions/renderer/object_backed_native_handler.cc
|
| index b88bf32ca4cb291c6d5cfe86a09732f229e23d67..060606b6703797c20b918a6604fdd9c5dd1c4111 100644
|
| --- a/extensions/renderer/object_backed_native_handler.cc
|
| +++ b/extensions/renderer/object_backed_native_handler.cc
|
| @@ -9,6 +9,7 @@
|
| #include "extensions/renderer/console.h"
|
| #include "extensions/renderer/module_system.h"
|
| #include "extensions/renderer/script_context.h"
|
| +#include "extensions/renderer/script_context_set.h"
|
| #include "v8/include/v8.h"
|
|
|
| namespace extensions {
|
| @@ -44,7 +45,9 @@ void ObjectBackedNativeHandler::Router(
|
| // See comment in header file for why we do this.
|
| if (handler_function_value.IsEmpty() ||
|
| handler_function_value->IsUndefined()) {
|
| - console::Error(args.GetIsolate()->GetCallingContext(),
|
| + ScriptContext* script_context = ScriptContextSet::GetContextByV8Context(
|
| + args.GetIsolate()->GetCallingContext());
|
| + console::Error(script_context ? script_context->GetRenderFrame() : nullptr,
|
| "Extension view no longer exists");
|
| return;
|
| }
|
|
|