Merge 188631 "Don't throw exceptions when v8 objects/contexts ar..."

chrome/renderer/extensions/object_backed_native_handler.cc

 // Copyright (c) 2012 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/renderer/extensions/object_backed_native_handler.h"
 
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
+#include "chrome/renderer/extensions/console.h"
 #include "chrome/renderer/extensions/module_system.h"
 #include "v8/include/v8.h"
 
 namespace extensions {
 
 namespace {
 // Key for the base::Bound routed function.
 const char* kHandlerFunction = "handler_function";
 }  // namespace
 
@@ skipping 15 matching lines @@
 v8::Handle<v8::Value> ObjectBackedNativeHandler::Router(
     const v8::Arguments& args) {
   v8::HandleScope handle_scope;
   v8::Handle<v8::Object> data = args.Data().As<v8::Object>();
 
   v8::Handle<v8::Value> handler_function_value =
       data->Get(v8::String::New(kHandlerFunction));
   // See comment in header file for why we do this.
   if (handler_function_value.IsEmpty() ||
       handler_function_value->IsUndefined()) {
-    return v8::ThrowException(v8::String::New(
-        "Extension view no longer exists"));
+    console::Error(v8::Context::GetCalling(),
+                   "Extension view no longer exists");
+    return v8::Undefined();
   }
   DCHECK(handler_function_value->IsExternal());
   return handle_scope.Close(static_cast<HandlerFunction*>(
       handler_function_value.As<v8::External>()->Value())->Run(args));
 }
 
 void ObjectBackedNativeHandler::RouteFunction(
     const std::string& name,
     const HandlerFunction& handler_function) {
   v8::HandleScope handle_scope;
@@ skipping 25 matching lines @@
         handler_function_value.As<v8::External>()->Value());
     data->Delete(v8::String::New(kHandlerFunction));
     data.Dispose(v8_context_->GetIsolate());
   }
   object_template_.reset();
   v8_context_.reset();
   NativeHandler::Invalidate();
 }
 
 }   // extensions