Refactor away most of ExtensionRendererInfo

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 "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
@@ skipping 247 matching lines @@
   v8::Local<v8::Context> context = v8::Context::GetCurrent();
   DCHECK(!context.IsEmpty());
   DCHECK(bindings_utils::FindContext(context) == contexts.end());
 
   // 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();
-  std::string extension_id = ExtensionRendererInfo::GetIdByURL(url);
+  ExtensionRendererInfo* extensions = RenderThread::current()->extensions();

[Matt Perry, 2011/01/24 20:08:34]

use the render_thread global instead, since RenderThread::current() is NULL in
unit tests. You'll have to make the extensions getter a virtual on
RenderThreadBase.

[Aaron Boodman, 2011/01/25 00:27:33]

Done.

+  std::string extension_id = extensions->GetIdByURL(url);
 
-  if (!ExtensionRendererInfo::ExtensionBindingsAllowed(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;
 
@@ skipping 90 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
   }
 }