Move SystemIndicator parsing out of Extension class

chrome/common/extensions/api/extension_action/script_badge_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/api/extension_action/script_badge_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/extensions/manifest.h"
-#include "chrome/common/extensions/manifest_handler_helpers.h"
 #include "extensions/common/install_warning.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
 namespace extensions {
 
 ScriptBadgeHandler::ScriptBadgeHandler() {
 }
 
@@ skipping 22 matching lines @@
         InstallWarning(InstallWarning::FORMAT_TEXT,
                        errors::kScriptBadgeRequiresFlag));
   }
 
   const DictionaryValue* dict = NULL;
   if (!extension->manifest()->GetDictionary(keys::kScriptBadge, &dict)) {
     *error = ASCIIToUTF16(errors::kInvalidScriptBadge);
     return false;
   }
 
-  action_info =
-      manifest_handler_helpers::LoadActionInfo(extension, dict, error);
+  action_info = ActionInfo::Load(extension, dict, error);
 
   if (!action_info.get())
     return false;  // Failed to parse script badge definition.
 
   // Script badges always use their extension's title and icon so users can rely
   // on the visual appearance to know which extension is running.  This isn't
   // bulletproof since an malicious extension could use a different 16x16 icon
   // that matches the icon of a trusted extension, and users wouldn't be warned
   // during installation.
 
@@ skipping 31 matching lines @@
           extension_misc::kScriptBadgeIconSizes[i], path);
     }
   }
 }
 
 const std::vector<std::string> ScriptBadgeHandler::Keys() const {
   return SingleKey(keys::kScriptBadge);
 }
 
 }  // namespace extensions