Refactoring: de-couple Extensions from "script injection System" [render side] : 1

extensions/renderer/dispatcher.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/dispatcher.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 217 matching lines @@
   return is_active;
 }
 
 const Extension* Dispatcher::GetExtensionFromFrameAndWorld(
     const WebFrame* frame,
     int world_id,
     bool use_effective_url) {
   std::string extension_id;
   if (world_id != 0) {
     // Isolated worlds (content script).
-    extension_id = ScriptInjection::GetExtensionIdForIsolatedWorld(world_id);
+    extension_id =
+        ScriptInjection::GetHostIdForIsolatedWorld(world_id).id();
   } else if (!frame->document().securityOrigin().isUnique()) {
     // TODO(kalman): Delete the above check.
 
     // Extension pages (chrome-extension:// URLs).
     GURL frame_url = ScriptContext::GetDataSourceURLForFrame(frame);
     frame_url = ScriptContext::GetEffectiveDocumentURL(
         frame, frame_url, use_effective_url);
     extension_id = extensions_.GetExtensionOrAppIDByURL(frame_url);
   }
 
@@ skipping 775 matching lines @@
   RenderThread::Get()->Send(new ExtensionHostMsg_TransferBlobsAck(blob_uuids));
 }
 
 void Dispatcher::OnUnloaded(const std::string& id) {
   extensions_.Remove(id);
   active_extension_ids_.erase(id);
 
   // If the extension is later reloaded with a different set of permissions,
   // we'd like it to get a new isolated world ID, so that it can pick up the
   // changed origin whitelist.
-  ScriptInjection::RemoveIsolatedWorld(id);
+  ScriptInjection::RemoveIsolatedWorld(HostID(HostID::EXTENSIONS, id));
 
   // Invalidate all of the contexts that were removed.
   // TODO(kalman): add an invalidation observer interface to ScriptContext.
   ScriptContextSet::ContextSet removed_contexts =
       script_context_set_.OnExtensionUnloaded(id);
   for (ScriptContextSet::ContextSet::iterator it = removed_contexts.begin();
        it != removed_contexts.end();
        ++it) {
     request_sender_->InvalidateSource(*it);
   }
@@ skipping 493 matching lines @@
     return v8::Handle<v8::Object>();
 
   if (bind_name)
     *bind_name = split.back();
 
   return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context))
                                : bind_object;
 }
 
 }  // namespace extensions