Limit extensions to 1 UI surface (either Page/Browser action, but not both)....

chrome/common/extensions/extension_unittest.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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 201 matching lines @@
   EXPECT_EQ(errors::kInvalidPrivacyBlacklists, error);
 
   // 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(MatchPattern(error, errors::kInvalidPrivacyBlacklistsPath));
+
+  // 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());
+  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);
 }
 
 TEST(ExtensionTest, InitFromValueValid) {
 #if defined(OS_WIN)
   FilePath path(FILE_PATH_LITERAL("C:\\foo"));
 #elif defined(OS_POSIX)
   FilePath path(FILE_PATH_LITERAL("/foo"));
 #endif
   Extension extension(path);
   std::string error;
@@ skipping 162 matching lines @@
   error_msg = "";
 
   // Same test (name key), but with browser action.
   copy.reset(static_cast<DictionaryValue*>(input.DeepCopy()));
   copy->Remove(keys::kPageActionIcons, NULL);
   action.reset(extension.LoadExtensionActionHelper(
       copy.get(), &error_msg, ExtensionAction::BROWSER_ACTION));
   ASSERT_TRUE(NULL != action.get());
 
   // Now test that we can parse the new format for page actions.
-  
+
   // Now setup some values to use in the page action.
   const std::string kTitle("MyExtensionActionTitle");
   const std::string kIcon("image1.png");
 
   // Add the dictionary for the contextual action.
   input.Clear();
   input.SetString(keys::kPageActionDefaultTitle, kTitle);
   input.SetString(keys::kPageActionDefaultIcon, kIcon);
 
   // Parse as page action and read back the values from the object.
@@ skipping 253 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;
   }
 }