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

chrome/renderer/extensions/app_bindings.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/app_bindings.h"
 
 #include "base/command_line.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
+#include "chrome/renderer/extensions/console.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "chrome/renderer/extensions/extension_helper.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "v8/include/v8.h"
 
 using WebKit::WebFrame;
@@ skipping 72 matching lines @@
     return v8::ThrowException(
         v8::String::New("Argument 0 must be an object."));
   }
 
   v8::Local<v8::Context> context =
       v8::Local<v8::Object>::Cast(args[0])->CreationContext();
   CHECK(!context.IsEmpty());
 
   WebFrame* target_frame = WebFrame::frameForContext(context);
   if (!target_frame) {
-    return v8::ThrowException(
-        v8::String::New("Could not find frame for specified object."));
+    console::Error(v8::Context::GetCalling(),
+                   "Could not find frame for specified object.");
+    return v8::Undefined();
   }
 
   return GetDetailsForFrameImpl(target_frame);
 }
 
 v8::Handle<v8::Value> AppBindings::GetDetailsForFrameImpl(
     WebFrame* frame) {
   const Extension* extension =
       dispatcher_->extensions()->GetExtensionOrAppByURL(
           ExtensionURLInfo(frame->document().securityOrigin(),
@@ skipping 78 matching lines @@
   v8::HandleScope handle_scope;
   v8::Context::Scope context_scope(context_->v8_context());
   v8::Handle<v8::Value> argv[2];
   argv[0] = v8::String::New(state.c_str());
   argv[1] = v8::Integer::New(callback_id);
   CHECK(context_->CallChromeHiddenMethod("app.onInstallStateResponse",
                                          arraysize(argv), argv, NULL));
 }
 
 }  // namespace extensions