Move parsing of NaCl modules out of Extension.

chrome/browser/extensions/extension_service.h

Index: chrome/browser/extensions/extension_service.h
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index ea62a5b53ffe5cb08e004480a67a7014d0fd325d..e60272a5f21071dc055f9e1193d9b4c59fee9b91 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 
-#include <list>
 #include <map>
 #include <set>
 #include <string>
@@ -36,6 +35,7 @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/manifest.h"
+#include "chrome/common/extensions/manifest_handlers/nacl_modules_handler.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/common/one_shot_event.h"
@@ -692,15 +692,6 @@ class ExtensionService
   };
   typedef std::map<std::string, ExtensionRuntimeData> ExtensionRuntimeDataMap;
 
-  struct NaClModuleInfo {
-    NaClModuleInfo();
-    ~NaClModuleInfo();
-
-    GURL url;
-    std::string mime_type;
-  };
-  typedef std::list<NaClModuleInfo> NaClModuleInfoList;
-
   // Signals *ready_ and sends a notification to the listeners.
   void SetReadyAndNotifyListeners();
 
@@ -779,14 +770,14 @@ class ExtensionService
   // type, just the ones that are responsible for rendering a particular MIME
   // type, like application/pdf. Note: We only register NaCl modules in the
   // browser process.
-  void RegisterNaClModule(const GURL& url, const std::string& mime_type);
-  void UnregisterNaClModule(const GURL& url);
+  void RegisterNaClModule(const extensions::NaClModuleInfo& info);
+  void UnregisterNaClModule(const extensions::NaClModuleInfo& info);
 
   // Call UpdatePluginListWithNaClModules() after registering or unregistering
   // a NaCl module to see those changes reflected in the PluginList.
   void UpdatePluginListWithNaClModules();
 
-  NaClModuleInfoList::iterator FindNaClModule(const GURL& url);
+  extensions::NaClModuleInfo::List::iterator FindNaClModule(const GURL& url);
 
   // Performs tasks requested to occur after |extension| loads.
   void DoPostLoadTasks(const extensions::Extension* extension);
@@ -964,7 +955,7 @@ class ExtensionService
   // first time.
   bool is_first_run_;
 
-  NaClModuleInfoList nacl_module_list_;
+  extensions::NaClModuleInfo::List nacl_module_list_;
 
   extensions::AppSyncBundle app_sync_bundle_;
   extensions::ExtensionSyncBundle extension_sync_bundle_;