Move BrowserAction out of Extension

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 0935327e78d484bf96c829d9b1d0a48d4bff85df..b185d2c21eea763360baff8857edde7b1943fa57 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -20,7 +20,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "chrome/common/extensions/api/extension_action/action_info.h"
+#include "base/threading/thread_checker.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
@@ -55,7 +55,7 @@ struct WebIntentServiceData;
 FORWARD_DECLARE_TEST(TabStripModelTest, Apps);
 
 namespace extensions {
-
+class ActionInfo;
 class Manifest;
 class PermissionSet;
 
@@ -669,9 +669,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   }
   const UserScriptList& content_scripts() const { return content_scripts_; }
   const ActionInfo* page_action_info() const { return page_action_info_.get(); }
-  const ActionInfo* browser_action_info() const {
-    return browser_action_info_.get();
-  }
   const ActionInfo* system_indicator_info() const {
     return system_indicator_info_.get();
   }
@@ -1071,9 +1068,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   // The extension's page action, if any.
   scoped_ptr<ActionInfo> page_action_info_;
 
-  // The extension's browser action, if any.
-  scoped_ptr<ActionInfo> browser_action_info_;
-
   // The extension's system indicator, if any.
   scoped_ptr<ActionInfo> system_indicator_info_;
 
@@ -1162,6 +1156,11 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   // Set to true at the end of InitValue when initialization is finished.
   bool finished_parsing_manifest_;
 
+  // Ensures that any call to GetManifestData() prior to finishing
+  // initialization happens from the same thread (this can happen when certain
+  // parts of the initialization process need information from previous parts).
+  base::ThreadChecker thread_checker_;
+
   // A map of chrome:// hostnames (newtab, downloads, etc.) to Extension URLs
   // which override the handling of those URLs. (see ExtensionOverrideUI).
   URLOverrideMap chrome_url_overrides_;