Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / shared_module_service.cc

diff --git a/src/chrome/browser/extensions/shared_module_service.cc b/src/chrome/browser/extensions/shared_module_service.cc
index a56f75c..c5ea4de 100644 (file)
--- a/src/chrome/browser/extensions/shared_module_service.cc
+++ b/src/chrome/browser/extensions/shared_module_service.cc
@@ -10,11 +10,11 @@
 #include "base/version.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
-#include "chrome/common/extensions/extension_constants.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_urls.h"
 
 namespace extensions {
 
@@ -43,6 +43,9 @@ SharedModuleService::ImportStatus SharedModuleService::CheckImports(
 
   ImportStatus status = IMPORT_STATUS_OK;
 
+  // TODO(crbug.com/420147): Code like this lives in CrxInstaller and
+  // UnpackedInstaller.  If a change is made here that is important to enforce
+  // at install time, those locations need to be updated.
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context_);
   const ImportInfoVector& imports = SharedModuleInfo::GetImports(extension);
   for (ImportInfoVector::const_iterator iter = imports.begin();
@@ -126,7 +129,7 @@ scoped_ptr<ExtensionSet> SharedModuleService::GetDependentExtensions(
       }
     }
   }
-  return dependents.PassAs<ExtensionSet>();
+  return dependents.Pass();
 }
 
 void SharedModuleService::PruneSharedModules() {