Improvements to fatal JavaScript extension errors: (1) include the extension

chrome/renderer/extensions/chrome_v8_context_set.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/chrome_v8_context_set.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/tracked_objects.h"
 #include "base/values.h"
@@ skipping 42 matching lines @@
     context->Invalidate();
     base::MessageLoop::current()->DeleteSoon(FROM_HERE, context);
   }
 }
 
 ChromeV8ContextSet::ContextSet ChromeV8ContextSet::GetAll() const {
   return contexts_;
 }
 
 ChromeV8Context* ChromeV8ContextSet::GetCurrent() const {
-  if (!v8::Context::InContext())
-    return NULL;
-  else
-    return GetByV8Context(v8::Context::GetCurrent());
+  v8::Local<v8::Context> current = v8::Context::GetCurrent();
+  return current.IsEmpty() ? NULL : GetByV8Context(current);
+}
+
+ChromeV8Context* ChromeV8ContextSet::GetCalling() const {
+  v8::Local<v8::Context> calling = v8::Context::GetCalling();
+  return calling.IsEmpty() ? NULL : GetByV8Context(calling);
 }
 
 ChromeV8Context* ChromeV8ContextSet::GetByV8Context(
     v8::Handle<v8::Context> v8_context) const {
   for (ContextSet::const_iterator iter = contexts_.begin();
        iter != contexts_.end(); ++iter) {
     if ((*iter)->v8_context() == v8_context)
       return *iter;
   }
 
@@ skipping 47 matching lines @@
       (*it)->DispatchOnUnloadEvent();
       removed.insert(*it);
       Remove(*it);
     }
   }
 
   return removed;
 }
 
 }  // namespace extensions