Move SystemIndicator parsing out of Extension class

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

 // Copyright (c) 2013 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/page_action_handler.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
-#include "chrome/common/extensions/manifest_handler_helpers.h"
 #include "grit/generated_resources.h"
 
 namespace keys = extension_manifest_keys;
 namespace errors = extension_manifest_errors;
 
 namespace extensions {
 
 PageActionHandler::PageActionHandler() {
 }
 
@@ skipping 28 matching lines @@
   } else if (extension->manifest()->HasKey(keys::kPageAction)) {
     if (!extension->manifest()->GetDictionary(keys::kPageAction,
                                               &page_action_value)) {
       *error = ASCIIToUTF16(errors::kInvalidPageAction);
       return false;
     }
   }
 
   // If page_action_value is not NULL, then there was a valid page action.
   if (page_action_value) {
-    page_action_info = manifest_handler_helpers::LoadActionInfo(
-        extension, page_action_value, error);
+    page_action_info = ActionInfo::Load(extension, page_action_value, error);
     if (!page_action_info)
       return false;  // Failed to parse page action definition.
   }
   ActionInfo::SetPageActionInfo(extension, page_action_info.release());
 
   return true;
 }
 
 bool PageActionHandler::Validate(const Extension* extension,
                                  std::string* error,
@@ skipping 12 matching lines @@
 }
 
 const std::vector<std::string> PageActionHandler::Keys() const {
   std::vector<std::string> keys;
   keys.push_back(keys::kPageAction);
   keys.push_back(keys::kPageActions);
   return keys;
 }
 
 }  // namespace extensions