Moved ExtensionInfoMap and ExtensionsQuotaService to extensions/

chrome/browser/extensions/extension_function.h

Index: chrome/browser/extensions/extension_function.h
diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h
index 283482373e6fce80bd0406b7a149320c467f9363..d461c6389c6e9754d7259106cf75cc745af81ee2 100644
--- a/chrome/browser/extensions/extension_function.h
+++ b/chrome/browser/extensions/extension_function.h
@@ -16,10 +16,10 @@
 #include "base/process/process.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "chrome/browser/extensions/extension_function_histogram_value.h"
-#include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/console_message_level.h"
+#include "extensions/browser/info_map.h"
 #include "ipc/ipc_message.h"
 
 class ChromeRenderMessageFilter;
@@ -27,7 +27,6 @@ class ExtensionFunction;
 class ExtensionFunctionDispatcher;
 class UIThreadExtensionFunction;
 class IOThreadExtensionFunction;
-class QuotaLimitHeuristic;
 
 namespace base {
 class ListValue;
@@ -40,6 +39,10 @@ class RenderViewHost;
 class WebContents;
 }
 
+namespace extensions {
+class QuotaLimitHeuristic;
+}
+
 #ifdef NDEBUG
 #define EXTENSION_FUNCTION_VALIDATE(test) do { \
     if (!(test)) { \
@@ -127,9 +130,9 @@ class ExtensionFunction
   // instances is passed to the owner of |heuristics|.
   // No quota limiting by default.
   //
-  // Only called once per lifetime of the ExtensionsQuotaService.
+  // Only called once per lifetime of the QuotaService.
   virtual void GetQuotaLimitHeuristics(
-      QuotaLimitHeuristics* heuristics) const {}
+      extensions::QuotaLimitHeuristics* heuristics) const {}
 
   // Called when the quota limit has been exceeded. The default implementation
   // returns an error.
@@ -367,10 +370,10 @@ class IOThreadExtensionFunction : public ExtensionFunction {
 
   int routing_id() const { return routing_id_; }
 
-  void set_extension_info_map(const ExtensionInfoMap* extension_info_map) {
+  void set_extension_info_map(const extensions::InfoMap* extension_info_map) {
     extension_info_map_ = extension_info_map;
   }
-  const ExtensionInfoMap* extension_info_map() const {
+  const extensions::InfoMap* extension_info_map() const {
     return extension_info_map_.get();
   }
 
@@ -389,7 +392,7 @@ class IOThreadExtensionFunction : public ExtensionFunction {
   base::WeakPtr<ChromeRenderMessageFilter> ipc_sender_;
   int routing_id_;
 
-  scoped_refptr<const ExtensionInfoMap> extension_info_map_;
+  scoped_refptr<const extensions::InfoMap> extension_info_map_;
 };
 
 // Base class for an extension function that runs asynchronously *relative to