Refactor extension bindings to share code, avoid exposing hidden variables

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 18 matching lines @@
 #include "chrome/common/page_zoom.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/about_handler.h"
 #include "chrome/renderer/audio_message_filter.h"
 #include "chrome/renderer/devtools_agent.h"
 #include "chrome/renderer/devtools_client.h"
 #include "chrome/renderer/extensions/event_bindings.h"
-#include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/media/audio_renderer_impl.h"
 #include "chrome/renderer/media/buffered_data_source.h"
 #include "chrome/renderer/navigation_state.h"
 #include "chrome/renderer/print_web_view_helper.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/renderer_logging.h"
 #include "chrome/renderer/user_script_slave.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
@@ skipping 1401 matching lines @@
 }
 
 void RenderView::DocumentElementAvailable(WebFrame* frame) {
   // TODO(mpcomplete): remove this before Chrome extensions ship.
   // HACK.  This is a temporary workaround to allow cross-origin XHR for Chrome
   // extensions.  It grants full access to every origin, when we really want
   // to be able to restrict them more specifically.
   if (frame->GetURL().SchemeIs(chrome::kExtensionScheme))
     frame->GrantUniversalAccess();
 
-  // Tell extensions to self-register their js contexts.
-  // TODO(rafaelw): This is kind of gross. We need a way to call through
-  // the glue layer to retrieve the current v8::Context.
-  if (frame->GetURL().SchemeIs(chrome::kExtensionScheme))
-    ExtensionProcessBindings::RegisterExtensionContext(frame);
-
   if (RenderThread::current())  // Will be NULL during unit tests.
     RenderThread::current()->user_script_slave()->InjectScripts(
         frame, UserScript::DOCUMENT_START);
 }
 
 void RenderView::DidCreateScriptContext(WebFrame* webframe) {
   EventBindings::HandleContextCreated(webframe);
 }
 
 void RenderView::DidDestroyScriptContext(WebFrame* webframe) {
@@ skipping 1340 matching lines @@
                                       int request_id,
                                       bool has_callback) {
   Send(new ViewHostMsg_ExtensionRequest(routing_id_, name, args, request_id,
                                         has_callback));
 }
 
 void RenderView::OnExtensionResponse(int request_id,
                                      bool success,
                                      const std::string& response,
                                      const std::string& error) {
-  ExtensionProcessBindings::HandleResponse(request_id, success, response,
-                                           error);
+  EventBindings::HandleResponse(request_id, success, response, error);
 }
 
 // Dump all load time histograms.
 //
 // There are 13 histograms measuring various times.
 // The time points we keep are
 //    request: time document was requested by user
 //    start: time load of document started
 //    commit: time load of document started
 //    finish_document: main document loaded, before onload()
@@ skipping 146 matching lines @@
     Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms));
 }
 
 void RenderView::Print(WebFrame* frame, bool script_initiated) {
   DCHECK(frame);
   if (print_helper_.get() == NULL) {
     print_helper_.reset(new PrintWebViewHelper(this));
   }
   print_helper_->Print(frame, script_initiated);
 }