[Extensions] Kill off ExtensionMsg_AddMessageToConsole

extensions/renderer/script_context_set.cc

 // Copyright 2014 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 "extensions/renderer/script_context_set.h"
 
 #include "base/message_loop/message_loop.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/extension.h"
 #include "extensions/renderer/extension_groups.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_injection.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "v8/include/v8.h"
 
 namespace extensions {
 
+namespace {
+// There is only ever one instance of the ScriptContextSet.
+ScriptContextSet* g_context_set = nullptr;
+}
+
 ScriptContextSet::ScriptContextSet(ExtensionSet* extensions,
                                    ExtensionIdSet* active_extension_ids)
     : extensions_(extensions), active_extension_ids_(active_extension_ids) {
+  DCHECK(!g_context_set);
+  g_context_set = this;
 }
 
 ScriptContextSet::~ScriptContextSet() {
+  g_context_set = nullptr;
 }
 
 ScriptContext* ScriptContextSet::Register(
     blink::WebLocalFrame* frame,
     const v8::Local<v8::Context>& v8_context,
     int extension_group,
     int world_id) {
   const Extension* extension =
       GetExtensionFromFrameAndWorld(frame, world_id, false);
   const Extension* effective_extension =
@@ skipping 36 matching lines @@
 
 ScriptContext* ScriptContextSet::GetByV8Context(
     const v8::Local<v8::Context>& v8_context) const {
   for (ScriptContext* script_context : contexts_) {
     if (script_context->v8_context() == v8_context)
       return script_context;
   }
   return nullptr;
 }
 
+ScriptContext* ScriptContextSet::GetContextByV8Context(
+    const v8::Local<v8::Context>& v8_context) {
+  // g_context_set can be null in unittests.
+  return g_context_set ? g_context_set->GetByV8Context(v8_context) : nullptr;
+}
+
 void ScriptContextSet::ForEach(
     const std::string& extension_id,
     content::RenderView* render_view,
     const base::Callback<void(ScriptContext*)>& callback) const {
   // We copy the context list, because calling into javascript may modify it
   // out from under us.
   std::set<ScriptContext*> contexts_copy = contexts_;
 
   for (ScriptContext* context : contexts_copy) {
     // For the same reason as above, contexts may become invalid while we run.
@@ skipping 111 matching lines @@
 
 void ScriptContextSet::DispatchOnUnloadEventAndRemove(
     std::set<ScriptContext*>* out,
     ScriptContext* context) {
   context->DispatchOnUnloadEvent();
   Remove(context);  // deleted asynchronously
   out->insert(context);
 }
 
 }  // namespace extensions