Use the correct v8 context for conversions when calling into the plugin from JS

content/renderer/pepper/pepper_plugin_instance_impl.cc

Index: content/renderer/pepper/pepper_plugin_instance_impl.cc
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index 98ca698ed56415c5ab34ced2dbebc7737345efd6..8cb02d6b15cdd23efd28efd0e4c80a1985c27248 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -672,13 +672,18 @@ void PepperPluginInstanceImpl::MessageChannelDestroyed() {
   message_channel_object_.Reset();
 }
 
-v8::Local<v8::Context> PepperPluginInstanceImpl::GetContext() {
-  if (!container_ ||
-      container_->element().isNull() ||
-      container_->element().document().isNull() ||
-      !container_->element().document().frame()) {
+v8::Local<v8::Context> PepperPluginInstanceImpl::GetMainWorldContext() {
+  if (!container_)
+    return v8::Handle<v8::Context>();
+
+  if (container_->element().isNull())
+    return v8::Handle<v8::Context>();
+
+  if (container_->element().document().isNull())
+    return v8::Handle<v8::Context>();
+
+  if (!container_->element().document().frame())
     return v8::Handle<v8::Context>();
-  }
 
   v8::Local<v8::Context> context =
       container_->element().document().frame()->mainWorldScriptContext();