Neither name nor title are required for page- or browser-actions. Update loader

and unit tests.

BUG=25482
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/307048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30392 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 5 deletions

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index db05c4b..ab2ff76 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -344,12 +344,19 @@ ExtensionAction* Extension::LoadExtensionActionHelper(
     result->set_default_icon_path(default_icon);
   }
 
-  // Read the page action |default_title|.
+  // Read the page action title from |default_title| if present, |name| if not
+  // (both optional).
   std::string title;
-  if (!extension_action->GetString(keys::kName, &title) &&
-      !extension_action->GetString(keys::kPageActionDefaultTitle, &title)) {
-    *error = errors::kInvalidPageActionDefaultTitle;
-    return NULL;
+  if (extension_action->HasKey(keys::kPageActionDefaultTitle)) {
+    if (!extension_action->GetString(keys::kPageActionDefaultTitle, &title)) {
+      *error = errors::kInvalidPageActionDefaultTitle;
+      return NULL;
+    }
+  } else if (extension_action->HasKey(keys::kName)) {
+    if (!extension_action->GetString(keys::kName, &title)) {
+      *error = errors::kInvalidPageActionName;
+      return NULL;
+    }
   }
   result->SetTitle(ExtensionAction::kDefaultTabId, title);