Update page action manifest parsing to match the new format.

chrome/browser/extensions/extensions_service.cc

 // Copyright (c) 2009 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/browser/extensions/extensions_service.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 356 matching lines @@
 
 std::vector<ExtensionAction*> ExtensionsService::GetExtensionActions(
     ExtensionAction::ExtensionActionType action_type,
     bool include_popups) const {
   std::vector<ExtensionAction*> result;
 
   // TODO(finnur): Sort the icons in some meaningful way.
   for (ExtensionList::const_iterator iter = extensions_.begin();
        iter != extensions_.end(); ++iter) {
     if (action_type == ExtensionAction::PAGE_ACTION) {
-      const ExtensionActionMap* page_actions = &(*iter)->page_actions();
-      for (ExtensionActionMap::const_iterator i(page_actions->begin());
-           i != page_actions->end(); ++i) {
-        if (include_popups || !i->second->is_popup())
-          result.push_back(i->second);
+      ExtensionAction* page_action = (*iter)->page_action();
+      if (page_action && (include_popups || !page_action->is_popup())) {
+        result.push_back(page_action);
       }
     } else {
       ExtensionAction* browser_action = (*iter)->browser_action();
       if (browser_action && (include_popups || !browser_action->is_popup()))
         result.push_back(browser_action);
     }
   }
 
   return result;
 }
@@ skipping 412 matching lines @@
       linked_ptr<ExternalExtensionProvider>(test_provider);
 }
 
 void ExtensionsServiceBackend::OnExternalExtensionFound(
     const std::string& id, const Version* version, const FilePath& path,
     Extension::Location location) {
   frontend_loop_->PostTask(FROM_HERE, NewRunnableMethod(frontend_,
       &ExtensionsService::OnExternalExtensionFound, id, version->GetString(),
       path, location));
 }