Update Chrome to use new context notification APIs from WebKit.

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index d2b21683c4f74e9a3dae5039fd1b3fd8a6aaf530..8ce0ae58bb188ae3d1453a2a35bd6268df4ef9d5 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -638,30 +638,19 @@ bool ChromeContentRendererClient::ShouldPumpEventsDuringCookieMessage() {
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeFrame);
 }
 
-void ChromeContentRendererClient::DidCreateScriptContext(WebFrame* frame) {
-  // This can happen if the frame has JavaScript disabled. The context was
-  // created  but we can't access it through mainWorldScriptContext().
-  if (frame->mainWorldScriptContext().IsEmpty())
-    return;
-
+void ChromeContentRendererClient::DidCreateScriptContext(
+    WebFrame* frame, v8::Handle<v8::Context> context, int world_id) {
   EventBindings::HandleContextCreated(frame,
-                                      frame->mainWorldScriptContext(),
+                                      context,
                                       extension_dispatcher_.get(),
-                                      0);  // isolated world ID
+                                      world_id);
 }
 
-void ChromeContentRendererClient::DidDestroyScriptContext(WebFrame* frame) {
+void ChromeContentRendererClient::WillReleaseScriptContext(
+    WebFrame* frame, v8::Handle<v8::Context> context, int world_id) {
   EventBindings::HandleContextDestroyed(frame);
 }
 
-void ChromeContentRendererClient::DidCreateIsolatedScriptContext(
-    WebFrame* frame, int world_id, v8::Handle<v8::Context> context) {
-  EventBindings::HandleContextCreated(frame,
-                                      context,
-                                      extension_dispatcher_.get(),
-                                      world_id);
-}
-
 unsigned long long ChromeContentRendererClient::VisitedLinkHash(
     const char* canonical_url, size_t length) {
   return visited_link_slave_->ComputeURLFingerprint(canonical_url, length);