Manual merge r153283 to b1180: Make ModuleSystem::DumpException() handle empty handles.

chrome/renderer/module_system.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/module_system.h"
 
 #include "base/bind.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedMicrotaskSuppression.h"
 
 namespace {
@@ skipping 41 matching lines @@
 }
 
 // static
 bool ModuleSystem::IsPresentInCurrentContext() {
   v8::Handle<v8::Object> global(v8::Context::GetCurrent()->Global());
   return !global->GetHiddenValue(v8::String::New(kModuleSystem))->IsUndefined();
 }
 
 // static
 void ModuleSystem::DumpException(v8::Handle<v8::Message> message) {
-  LOG(ERROR) << "["
-             << *v8::String::Utf8Value(
-                 message->GetScriptResourceName()->ToString())
-             << "(" << message->GetLineNumber() << ")] "
-             << *v8::String::Utf8Value(message->Get());
+  std::string resource_name = "<unknown resource>";
+  if (!message->GetScriptResourceName().IsEmpty()) {
+    resource_name = *v8::String::Utf8Value(
+        message->GetScriptResourceName()->ToString());
+  }
+
+  std::string error_message = "<no error message>";
+  if (!message->Get().IsEmpty())
+    error_message = *v8::String::Utf8Value(message->Get());
+
+  LOG(ERROR) << "[" << resource_name << "(" << message->GetLineNumber() << ")] "
+             << error_message;
 }
 
 void ModuleSystem::Require(const std::string& module_name) {
   v8::HandleScope handle_scope;
   RequireForJsInner(v8::String::New(module_name.c_str()));
 }
 
 v8::Handle<v8::Value> ModuleSystem::RequireForJs(const v8::Arguments& args) {
   v8::HandleScope handle_scope;
   v8::Handle<v8::String> module_name = args[0]->ToString();
@@ skipping 146 matching lines @@
   v8::Handle<v8::String> left =
       v8::String::New("(function(require, requireNative, exports) {");
   v8::Handle<v8::String> right = v8::String::New("\n})");
   return handle_scope.Close(
       v8::String::Concat(left, v8::String::Concat(source, right)));
 }
 
 v8::Handle<v8::Value> ModuleSystem::ThrowException(const std::string& message) {
   return v8::ThrowException(v8::String::New(message.c_str()));
 }