Refactor implementation of BrowserActions, and add support for

chrome/browser/extensions/extension_file_util.cc

Index: chrome/browser/extensions/extension_file_util.cc
diff --git a/chrome/browser/extensions/extension_file_util.cc b/chrome/browser/extensions/extension_file_util.cc
index 23bd085ab99b6ad9e9153ad9c2de4e730847601c..60d49818b54fd743b3e2abe7ef652e0dc242e4a1 100644
--- a/chrome/browser/extensions/extension_file_util.cc
+++ b/chrome/browser/extensions/extension_file_util.cc
@@ -242,11 +242,11 @@ bool ValidateExtension(Extension* extension, std::string* error) {
   }
 
   // Validate icon location for browser actions.
-  const ExtensionAction* browser_action = extension->browser_action();
+  ExtensionAction2* browser_action = extension->browser_action();
   if (browser_action) {
-    const std::vector<std::string>& icon_paths = browser_action->icon_paths();
-    for (std::vector<std::string>::const_iterator iter = icon_paths.begin();
-         iter != icon_paths.end(); ++iter) {
+    std::vector<std::string>* icon_paths = browser_action->icon_paths();
+    for (std::vector<std::string>::iterator iter = icon_paths->begin();
+         iter != icon_paths->end(); ++iter) {
       if (extension->GetResource(*iter).GetFilePath().empty()) {
         *error = StringPrintf("Could not load icon '%s' for browser action.",
                               iter->c_str());