Move ExtensionActionStorageManager out of extension_action_api.*

chrome/browser/extensions/api/extension_action/extension_action_api.h

Index: chrome/browser/extensions/api/extension_action/extension_action_api.h
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.h b/chrome/browser/extensions/api/extension_action/extension_action_api.h
index 11cec0e03fe77be67798ec2053e00fcd012f023f..38300967b3f71a68e75822084f88838be173a4bd 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.h
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.h
@@ -7,15 +7,13 @@
 
 #include <string>
 
-#include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "base/scoped_observer.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
-#include "extensions/browser/extension_registry_observer.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 namespace base {
 class DictionaryValue;
@@ -28,8 +26,6 @@ class WebContents;
 
 namespace extensions {
 class ExtensionPrefs;
-class ExtensionRegistry;
-class TabHelper;
 
 class ExtensionActionAPI : public BrowserContextKeyedAPI {
  public:
@@ -126,42 +122,6 @@ class ExtensionActionAPI : public BrowserContextKeyedAPI {
   DISALLOW_COPY_AND_ASSIGN(ExtensionActionAPI);
 };
 
-// This class manages reading and writing browser action values from storage.
-class ExtensionActionStorageManager
-    : public ExtensionActionAPI::Observer,
-      public ExtensionRegistryObserver,
-      public base::SupportsWeakPtr<ExtensionActionStorageManager> {
- public:
-  explicit ExtensionActionStorageManager(Profile* profile);
-  virtual ~ExtensionActionStorageManager();
-
- private:
-  // ExtensionActionAPI::Observer:
-  virtual void OnExtensionActionUpdated(
-      ExtensionAction* extension_action,
-      content::WebContents* web_contents,
-      content::BrowserContext* browser_context) OVERRIDE;
-  virtual void OnExtensionActionAPIShuttingDown() OVERRIDE;
-
-  // ExtensionRegistryObserver:
-  virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
-                                 const Extension* extension) OVERRIDE;
-
-  // Reads/Writes the ExtensionAction's default values to/from storage.
-  void WriteToStorage(ExtensionAction* extension_action);
-  void ReadFromStorage(
-      const std::string& extension_id, scoped_ptr<base::Value> value);
-
-  Profile* profile_;
-
-  ScopedObserver<ExtensionActionAPI, ExtensionActionAPI::Observer>
-      extension_action_observer_;
-
-  // Listen to extension loaded notification.
-  ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
-      extension_registry_observer_;
-};
-
 // Implementation of the browserAction and pageAction APIs.
 //
 // Divergent behaviour between the two is minimal (pageAction has required
@@ -183,10 +143,6 @@ class ExtensionActionFunction : public ChromeSyncExtensionFunction {
   void NotifyChange();
   bool SetVisible(bool visible);
 
-  // Extension-related information for |tab_id_|.
-  // CHECK-fails if there is no tab.
-  extensions::TabHelper& tab_helper() const;
-
   // All the extension action APIs take a single argument called details that
   // is a dictionary.
   base::DictionaryValue* details_;