Update Chromium to use new signature for

chrome/renderer/extensions/event_bindings.cc

 // Copyright (c) 2011 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/event_bindings.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
@@ skipping 269 matching lines @@
       UnregisterContext(it, true);
       return;
     }
   }
 
   NOTREACHED();
 }
 
 void EventBindings::HandleContextCreated(
     WebFrame* frame,
-    bool content_script,
-    ExtensionDispatcher* extension_dispatcher) {
+    v8::Handle<v8::Context> context,
+    ExtensionDispatcher* extension_dispatcher,
+    int isolated_world_id) {
   if (!bindings_registered)
     return;
 
+  bool content_script = isolated_world_id == 0;
+
   v8::HandleScope handle_scope;
   ContextList& contexts = GetContexts();
-  v8::Local<v8::Context> frame_context = frame->mainWorldScriptContext();
-  v8::Local<v8::Context> context = v8::Context::GetCurrent();
-  DCHECK(!context.IsEmpty());
-  DCHECK(bindings_utils::FindContext(context) == contexts.end());
+  // v8::Local<v8::Context> frame_context = frame->mainWorldScriptContext();
+  // v8::Local<v8::Context> context = v8::Context::GetCurrent();

[Matt Perry, 2011/08/15 22:22:18]

kill dead code

 
   // Figure out the frame's URL.  If the frame is loading, use its provisional
   // URL, since we get this notification before commit.
   WebDataSource* ds = frame->provisionalDataSource();
   if (!ds)
     ds = frame->dataSource();
   GURL url = ds->request().url();
   const ExtensionSet* extensions = extension_dispatcher->extensions();
   std::string extension_id = extensions->GetIdByURL(url);
 
   if (!extensions->ExtensionBindingsAllowed(url) &&
       !content_script) {
     // This context is a regular non-extension web page or an unprivileged
     // chrome app. Ignore it. We only care about content scripts and extension
     // frames.
     // (Unless we're in unit tests, in which case we don't care what the URL
     // is).
-    DCHECK(frame_context.IsEmpty() || frame_context == context);
     if (!in_unit_tests)
       return;
 
     // For tests, we want the dispatchOnLoad to actually setup our bindings,
     // so we give a fake extension id;
     extension_id = kTestingExtensionId;
   }
 
   v8::Persistent<v8::Context> persistent_context =
       v8::Persistent<v8::Context>::New(context);
   WebFrame* parent_frame = NULL;
 
   if (content_script) {
-    DCHECK(frame_context != context);
     parent_frame = frame;
     // Content script contexts can get GCed before their frame goes away, so
     // set up a GC callback.
     persistent_context.MakeWeak(NULL, &ContextWeakReferenceCallback);
   }
 
   RenderView* render_view = NULL;
   if (frame->view())
     render_view = RenderView::FromWebView(frame->view());
 
@@ skipping 80 matching lines @@
     // TODO(rafaelw): Consider only doing this check if function_name ==
     // "Event.dispatchJSON".
 #ifndef NDEBUG
     if (!retval.IsEmpty() && !retval->IsUndefined()) {
       std::string error = *v8::String::AsciiValue(retval);
       DCHECK(false) << error;
     }
 #endif
   }
 }