Change extension icon load errors to warnings

chrome/browser/extensions/api/extension_action/browser_action_unittest.cc

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
new file mode 100644
index 0000000000000000000000000000000000000000..86c7740c6432db28b0d72a824b27ccd63e2209ca
--- /dev/null
+++ b/chrome/browser/extensions/api/extension_action/browser_action_unittest.cc
@@ -0,0 +1,71 @@
+// 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);
+  ASSERT_FALSE(browser_action_info->default_icon.empty());

[Devlin, 2015/12/18 22:29:01]

nit: EXPECT here

[Evan Stade, 2015/12/19 00:02:40]

i guess this is redundant with L32, so removed

+
+  const ExtensionIconSet& icons = browser_action_info->default_icon;
+
+  // 24px icon should be included.
+  EXPECT_EQ(3u, 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("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);
+  ASSERT_FALSE(browser_action_info->default_icon.empty());
+
+  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