Move SystemIndicator parsing out of Extension class

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 32c4efb894e172c907542b4913914b253084066a..e932e3ddffd5638d7ca9ac872e306398d1df5f6f 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -183,18 +183,6 @@ bool ContainsManifestForbiddenPermission(const APIPermissionSet& apis,
   return false;
 }
 
-// Helper method to load an ExtensionAction from the page_action, script_badge,
-// browser_action, or system_indicator entries in the manifest.
-// TODO(rdevlin.cronin): Remove this once PageAction, BrowserAction, and
-// SystemIndicator have been moved out of Extension.
-scoped_ptr<ActionInfo> LoadExtensionActionInfoHelper(
-    const Extension* extension,
-    const DictionaryValue* extension_action,
-    string16* error) {
-  return manifest_handler_helpers::LoadActionInfo(
-      extension, extension_action, error);
-}
-
 }  // namespace
 
 const base::FilePath::CharType Extension::kManifestFilename[] =
@@ -1952,7 +1940,6 @@ bool Extension::LoadExtensionFeatures(string16* error) {
                           &converted_from_user_script_);
 
   if (!LoadContentScripts(error) ||
-      !LoadSystemIndicator(error) ||
       !LoadIncognitoMode(error))
     return false;
 
@@ -1989,33 +1976,6 @@ bool Extension::LoadContentScripts(string16* error) {
   return true;
 }
 
-bool Extension::LoadSystemIndicator(string16* error) {
-  if (!manifest_->HasKey(keys::kSystemIndicator)) {
-    // There was no manifest entry for the system indicator.
-    return true;
-  }
-
-  const DictionaryValue* system_indicator_value = NULL;
-  if (!manifest_->GetDictionary(keys::kSystemIndicator,
-                                &system_indicator_value)) {
-    *error = ASCIIToUTF16(errors::kInvalidSystemIndicator);
-    return false;
-  }
-
-  system_indicator_info_ = LoadExtensionActionInfoHelper(
-      this, system_indicator_value, error);
-
-  if (!system_indicator_info_.get()) {
-    return false;
-  }
-
-  // Because the manifest was successfully parsed, auto-grant the permission.
-  // TODO(dewittj) Add this for all extension action APIs.
-  initial_api_permissions()->insert(APIPermission::kSystemIndicator);
-
-  return true;
-}
-
 bool Extension::LoadIncognitoMode(string16* error) {
   // Apps default to split mode, extensions default to spanning.
   incognito_split_mode_ = is_app();