Index: chrome/renderer/extensions/extension_dispatcher.cc |
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc |
index 16a70dfd08df56da25b4bea0ae8d0db536e33582..dfe3bf9a0e1a6f29aaad692953a6fc483a854e1d 100644 |
--- a/chrome/renderer/extensions/extension_dispatcher.cc |
+++ b/chrome/renderer/extensions/extension_dispatcher.cc |
@@ -694,7 +694,8 @@ void ExtensionDispatcher::DidCreateScriptContext( |
v8::HandleScope handle_scope; |
v8::Handle<v8::String> chrome_string(v8::String::New("chrome")); |
v8::Handle<v8::Object> global(v8::Context::GetCurrent()->Global()); |
- if (global->Get(chrome_string)->IsUndefined()) |
+ v8::Handle<v8::Value> chrome(global->Get(chrome_string)); |
+ if (chrome.IsEmpty() || chrome->IsUndefined()) |
global->Set(chrome_string, v8::Object::New()); |
} |