Update Chrome to use new context notification APIs from WebKit.

chrome/renderer/chrome_content_renderer_client.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/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 620 matching lines @@
 
 bool ChromeContentRendererClient::ShouldPumpEventsDuringCookieMessage() {
   // We only need to pump events for chrome frame processes as the
   // cookie policy is controlled by the host browser (IE). If the
   // policy is set to prompt then the host would put up UI which
   // would require plugins if any to also pump to ensure that we
   // don't have a deadlock.
   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;
-
-  EventBindings::HandleContextCreated(frame,
-                                      frame->mainWorldScriptContext(),
-                                      extension_dispatcher_.get(),
-                                      0);  // isolated world ID
-}
-
-void ChromeContentRendererClient::DidDestroyScriptContext(WebFrame* frame) {
-  EventBindings::HandleContextDestroyed(frame);
-}
-
-void ChromeContentRendererClient::DidCreateIsolatedScriptContext(
-    WebFrame* frame, int world_id, v8::Handle<v8::Context> context) {
+void ChromeContentRendererClient::DidCreateScriptContext(
+    WebFrame* frame, v8::Handle<v8::Context> context, int world_id) {
   EventBindings::HandleContextCreated(frame,
                                       context,
                                       extension_dispatcher_.get(),
                                       world_id);
 }
 
+void ChromeContentRendererClient::WillReleaseScriptContext(
+    WebFrame* frame, v8::Handle<v8::Context> context, int world_id) {
+  EventBindings::HandleContextDestroyed(frame);
+}
+
 unsigned long long ChromeContentRendererClient::VisitedLinkHash(
     const char* canonical_url, size_t length) {
   return visited_link_slave_->ComputeURLFingerprint(canonical_url, length);
 }
 
 bool ChromeContentRendererClient::IsLinkVisited(unsigned long long link_hash) {
   return visited_link_slave_->IsVisited(link_hash);
 }
 
 void ChromeContentRendererClient::PrefetchHostName(const char* hostname,
@@ skipping 92 matching lines @@
   if (spellcheck_.get())
     thread->RemoveObserver(spellcheck_.get());
   SpellCheck* new_spellcheck = new SpellCheck();
   if (spellcheck_provider_)
     spellcheck_provider_->SetSpellCheck(new_spellcheck);
   spellcheck_.reset(new_spellcheck);
   thread->AddObserver(new_spellcheck);
 }
 
 }  // namespace chrome