Revert 35802 - Failed Valgrind - Allow an empty list of page actions.

BUG=26050
TEST=Updated existing unit tests ExtensionTest.InitFromValue*, manual testing on Linux.
Review URL: http://codereview.chromium.org/523132

TBR=skerner@chromium.org
Review URL: http://codereview.chromium.org/535003

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

1 files changed, 2 insertions, 21 deletions

diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc
index a2bb857..a294c23 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -223,29 +223,17 @@ TEST(ExtensionTest, InitFromValueInvalid) {
   EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
   EXPECT_TRUE(MatchPatternASCII(error, errors::kInvalidPrivacyBlacklistsPath));
 
-  // Multiple page actions are not allowed.
+  // Test invalid UI surface count (both page action and browser action).
   input_value.reset(static_cast<DictionaryValue*>(valid_value->DeepCopy()));
   DictionaryValue* action = new DictionaryValue;
   action->SetString(keys::kPageActionId, "MyExtensionActionId");
   action->SetString(keys::kName, "MyExtensionActionName");
   ListValue* action_list = new ListValue;
   action_list->Append(action->DeepCopy());
-  action_list->Append(action->DeepCopy());
-  input_value->Set(keys::kPageActions, action_list);
-  EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
-  EXPECT_STREQ(errors::kInvalidPageActionsListSize, error.c_str());
-
-  // Test invalid UI surface count (both page action and browser action).
-  input_value.reset(static_cast<DictionaryValue*>(valid_value->DeepCopy()));
-  action = new DictionaryValue;
-  action->SetString(keys::kPageActionId, "MyExtensionActionId");
-  action->SetString(keys::kName, "MyExtensionActionName");
-  action_list = new ListValue;
-  action_list->Append(action->DeepCopy());
   input_value->Set(keys::kPageActions, action_list);
   input_value->Set(keys::kBrowserAction, action);
   EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
-  EXPECT_STREQ(errors::kOneUISurfaceOnly, error.c_str());
+  EXPECT_STREQ(error.c_str(), errors::kOneUISurfaceOnly);
 
   // Test invalid options page url.
   input_value.reset(static_cast<DictionaryValue*>(valid_value->DeepCopy()));
@@ -307,13 +295,6 @@ TEST(ExtensionTest, InitFromValueValid) {
   EXPECT_EQ("chrome-extension", extension.options_url().scheme());
   EXPECT_EQ("/options.html", extension.options_url().path());
 
-  // Test that an empty list of page actions does not stop a browser action
-  // from being loaded.
-  ListValue* empty_list = new ListValue;
-  input_value.Set(keys::kPageActions, empty_list);
-  EXPECT_TRUE(extension.InitFromValue(input_value, false, &error));
-  EXPECT_EQ("", error);
-
 #if !defined(OS_MACOSX)
   // TODO(aa): The version isn't stamped into the unit test binary on mac.
   // Test with a minimum_chrome_version.