Allow an empty list of page actions.

chrome/common/extensions/extension_unittest.cc

 // Copyright (c) 2010 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/extension.h"
 
 #include "base/format_macros.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
@@ skipping 205 matching lines @@
 
   // Test invalid privacy blacklists list item.
   input_value.reset(static_cast<DictionaryValue*>(valid_value->DeepCopy()));
   ListValue* privacy_blacklists = NULL;
   input_value->GetList(keys::kPrivacyBlacklists, &privacy_blacklists);
   ASSERT_FALSE(NULL == privacy_blacklists);
   privacy_blacklists->Set(0, Value::CreateIntegerValue(42));
   EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
   EXPECT_TRUE(MatchPatternASCII(error, errors::kInvalidPrivacyBlacklistsPath));
 
-  // Test invalid UI surface count (both page action and browser action).
+  // Multiple page actions are not allowed.
   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);
+  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(error.c_str(), errors::kOneUISurfaceOnly);
+  EXPECT_STREQ(errors::kOneUISurfaceOnly, error.c_str());
 
   // Test invalid options page url.
   input_value.reset(static_cast<DictionaryValue*>(valid_value->DeepCopy()));
   input_value->Set(keys::kOptionsPage, Value::CreateNullValue());
   EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
   EXPECT_TRUE(MatchPatternASCII(error, errors::kInvalidOptionsPage));
 
   // Test invalid/empty default locale.
   input_value.reset(static_cast<DictionaryValue*>(valid_value->DeepCopy()));
   input_value->Set(keys::kDefaultLocale, Value::CreateIntegerValue(5));
@@ skipping 41 matching lines @@
   EXPECT_EQ(extension.id(), extension.url().host());
   EXPECT_EQ(path.value(), extension.path().value());
 
   // Test with an options page.
   input_value.SetString(keys::kOptionsPage, "options.html");
   EXPECT_TRUE(extension.InitFromValue(input_value, false, &error));
   EXPECT_EQ("", error);
   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.
   input_value.SetString(keys::kMinimumChromeVersion, "1.0");
   EXPECT_TRUE(extension.InitFromValue(input_value, false, &error));
   EXPECT_EQ("", error);
   // The minimum chrome version is not stored in the Extension object.
 #endif
 }
 
@@ skipping 381 matching lines @@
     scoped_ptr<Extension> new_extension(
         LoadManifest("allow_silent_upgrade",
                      std::string(kTests[i].base_name) + "_new.json"));
 
     EXPECT_EQ(kTests[i].expect_success,
               Extension::IsPrivilegeIncrease(old_extension.get(),
                                              new_extension.get()))
         << kTests[i].base_name;
   }
 }