Update WebFrameClient::didClearWindowObject API

content/shell/renderer/webkit_test_runner.cc

 // Copyright (c) 2012 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 "content/shell/renderer/webkit_test_runner.h"
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 
@@ skipping 540 matching lines @@
   if (id == routing_ids_.end()) {
     NOTREACHED();
     return std::string();
   }
   return DumpBackForwardList(session_histories_[pos],
                              current_entry_indexes_[pos]);
 }
 
 // RenderViewObserver  --------------------------------------------------------
 
-void WebKitTestRunner::DidClearWindowObject(WebLocalFrame* frame,
-                                            int world_id) {
+void WebKitTestRunner::DidClearWindowObject(WebLocalFrame* frame) {
   WebTestingSupport::injectInternalsObject(frame);
-  if (world_id == 0) {
-    ShellRenderProcessObserver::GetInstance()->test_interfaces()->bindTo(frame);
-    GCController::Install(frame);
-  }
+  ShellRenderProcessObserver::GetInstance()->test_interfaces()->bindTo(frame);
+  GCController::Install(frame);
 }
 
 bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebKitTestRunner, message)
     IPC_MESSAGE_HANDLER(ShellViewMsg_SetTestConfiguration,
                         OnSetTestConfiguration)
     IPC_MESSAGE_HANDLER(ShellViewMsg_SessionHistory, OnSessionHistory)
     IPC_MESSAGE_HANDLER(ShellViewMsg_Reset, OnReset)
     IPC_MESSAGE_HANDLER(ShellViewMsg_NotifyDone, OnNotifyDone)
@@ skipping 172 matching lines @@
 
   leak_detector_->TryLeakDetection(main_frame);
 }
 
 void WebKitTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content