Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6921)

Unified Diff: chrome/common/extensions/manifest_tests/extension_manifests_browseraction_unittest.cc

Issue 11644057: Move BrowserAction out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_ungoop_extension_action
Patch Set: Combined ActionInfo wrappers Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/manifest_tests/extension_manifests_browseraction_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_browseraction_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_browseraction_unittest.cc
deleted file mode 100644
index d6e9fb7277a96d6a3d64ad1edf159888ad7d7d9b..0000000000000000000000000000000000000000
--- a/chrome/common/extensions/manifest_tests/extension_manifests_browseraction_unittest.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) 2012 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_builder.h"
-#include "chrome/common/extensions/extension_icon_set.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
-#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
-#include "chrome/common/extensions/value_builder.h"
-#include "extensions/common/error_utils.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace errors = extension_manifest_errors;
-
-namespace extensions {
-namespace {
-
-TEST_F(ExtensionManifestTest, BrowserActionManifestIcons_NoDefaultIcons) {
- scoped_refptr<const Extension> extension =
- ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
- .Set("name", "No default properties")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("browser_action", DictionaryBuilder()
- .Set("default_title", "Title")))
- .Build();
-
- ASSERT_TRUE(extension.get());
- ASSERT_TRUE(extension->browser_action_info());
- EXPECT_TRUE(extension->browser_action_info()->default_icon.empty());
-}
-
-
-TEST_F(ExtensionManifestTest, BrowserActionManifestIcons_StringDefaultIcon) {
- scoped_refptr<const Extension> extension =
- ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
- .Set("name", "String default icon")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("browser_action", DictionaryBuilder()
- .Set("default_icon", "icon.png")))
- .Build();
-
- ASSERT_TRUE(extension.get());
- ASSERT_TRUE(extension->browser_action_info());
- ASSERT_FALSE(extension->browser_action_info()->default_icon.empty());
-
- const ExtensionIconSet& icons =
- extension->browser_action_info()->default_icon;
-
- EXPECT_EQ(1u, icons.map().size());
- EXPECT_EQ("icon.png", icons.Get(19, ExtensionIconSet::MATCH_EXACTLY));
-}
-
-TEST_F(ExtensionManifestTest, BrowserActionManifestIcons_DictDefaultIcon) {
- scoped_refptr<const Extension> extension =
- ExtensionBuilder()
- .SetManifest(DictionaryBuilder()
- .Set("name", "Dictionary default icon")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("browser_action", DictionaryBuilder()
- .Set("default_icon", DictionaryBuilder()
- .Set("19", "icon19.png")
- .Set("24", "icon24.png") // Should be ignored.
- .Set("38", "icon38.png"))))
- .Build();
-
- ASSERT_TRUE(extension.get());
- ASSERT_TRUE(extension->browser_action_info());
- ASSERT_FALSE(extension->browser_action_info()->default_icon.empty());
-
- const ExtensionIconSet& icons =
- extension->browser_action_info()->default_icon;
-
- // 24px icon should be ignored.
- EXPECT_EQ(2u, icons.map().size());
- EXPECT_EQ("icon19.png", icons.Get(19, ExtensionIconSet::MATCH_EXACTLY));
- EXPECT_EQ("icon38.png", icons.Get(38, ExtensionIconSet::MATCH_EXACTLY));
-}
-
-TEST_F(ExtensionManifestTest, BrowserActionManifestIcons_InvalidDefaultIcon) {
- scoped_ptr<DictionaryValue> manifest_value = DictionaryBuilder()
- .Set("name", "Invalid default icon")
- .Set("version", "1.0.0")
- .Set("manifest_version", 2)
- .Set("browser_action", DictionaryBuilder()
- .Set("default_icon", DictionaryBuilder()
- .Set("19", "") // Invalid value.
- .Set("24", "icon24.png")
- .Set("38", "icon38.png")))
- .Build();
-
- string16 error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kInvalidIconPath, "19");
- LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"),
- errors::kInvalidIconPath);
-}
-
-} // namespace
-} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698