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

Unified Diff: chrome/browser/extensions/api/extension_action/browser_action_unittest.cc

Issue 1554583002: Revert of Change extension icon load errors to warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge issues Created 5 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_action_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/extension_action/browser_action_unittest.cc
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_unittest.cc b/chrome/browser/extensions/api/extension_action/browser_action_unittest.cc
deleted file mode 100644
index 8060e9ebc6db6fa3ae1a765a8089a5c352cc0a12..0000000000000000000000000000000000000000
--- a/chrome/browser/extensions/api/extension_action/browser_action_unittest.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2015 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/files/file_util.h"
-#include "chrome/browser/extensions/extension_service_test_with_install.h"
-#include "chrome/common/extensions/api/extension_action/action_info.h"
-
-namespace extensions {
-namespace {
-
-class BrowserActionUnitTest : public ExtensionServiceTestWithInstall {
-};
-
-TEST_F(BrowserActionUnitTest, MultiIcons) {
- InitializeEmptyExtensionService();
- base::FilePath path =
- data_dir().AppendASCII("api_test/browser_action/multi_icons");
- ASSERT_TRUE(base::PathExists(path));
-
- const Extension* extension = PackAndInstallCRX(path, INSTALL_NEW);
-
- EXPECT_EQ(0U, extension->install_warnings().size());
- const ActionInfo* browser_action_info =
- ActionInfo::GetBrowserActionInfo(extension);
- ASSERT_TRUE(browser_action_info);
-
- const ExtensionIconSet& icons = browser_action_info->default_icon;
-
- // Extension can provide arbitrary sizes.
- EXPECT_EQ(4u, icons.map().size());
- EXPECT_EQ("icon19.png", icons.Get(19, ExtensionIconSet::MATCH_EXACTLY));
- EXPECT_EQ("icon24.png", icons.Get(24, ExtensionIconSet::MATCH_EXACTLY));
- EXPECT_EQ("icon24.png", icons.Get(31, ExtensionIconSet::MATCH_EXACTLY));
- EXPECT_EQ("icon38.png", icons.Get(38, ExtensionIconSet::MATCH_EXACTLY));
-}
-
-TEST_F(BrowserActionUnitTest, MissingIconInWebstoreCrx) {
- InitializeEmptyExtensionService();
- base::FilePath path =
- data_dir().AppendASCII("api_test/browser_action/missing_icon");
- ASSERT_TRUE(base::PathExists(path));
-
- const Extension* extension = PackAndInstallCRX(path, INSTALL_NEW);
-
- ASSERT_EQ(1U, extension->install_warnings().size());
- EXPECT_EQ("Could not load extension icon 'icon19.png'.",
- extension->install_warnings().front().message);
- const ActionInfo* browser_action_info =
- ActionInfo::GetBrowserActionInfo(extension);
- ASSERT_TRUE(browser_action_info);
-
- const ExtensionIconSet& icons = browser_action_info->default_icon;
-
- EXPECT_EQ(2u, icons.map().size());
- EXPECT_EQ("icon24.png", icons.Get(24, ExtensionIconSet::MATCH_EXACTLY));
- EXPECT_EQ("icon38.png", icons.Get(38, ExtensionIconSet::MATCH_EXACTLY));
-}
-
-TEST_F(BrowserActionUnitTest, MissingIconInCommandLine) {
- InitializeEmptyExtensionService();
- base::FilePath path =
- data_dir().AppendASCII("api_test/browser_action/missing_icon");
- ASSERT_TRUE(base::PathExists(path));
-
- PackAndInstallCRXWithLocation(path, Manifest::COMMAND_LINE, INSTALL_FAILED);
-}
-
-} // namespace
-} // namespace extensions
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_action_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698