Change extension icon load errors to warnings

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

 // 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 "build/build_config.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
@@ skipping 313 matching lines @@
   GetBrowserActionsBar()->Press(0);
   ASSERT_FALSE(catcher.GetNextResult());
   EXPECT_EQ(kEmptyImageDataError, catcher.message());
 
   // Try setting icon with empty dictionary of path objects.
   GetBrowserActionsBar()->Press(0);
   ASSERT_FALSE(catcher.GetNextResult());
   EXPECT_EQ(kEmptyPathError, catcher.message());
 }
 
+IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, MultiIcons) {

[Devlin, 2015/12/17 17:23:08]

Can this be a unittest?

[Evan Stade, 2015/12/17 20:15:58]

There already is a unit test that does almost exactly the same thing, but this
one exercises the new code to check the image exists. As far as I could tell
this was the best way to do that.

[Devlin, 2015/12/17 22:05:58]

This should be doable with a "unittest" (here basically just meaning something
that doesn't actually open a full-blown chrome browser, rather than something
which tests only a unit of code).  See, e.g., ExtensionServiceTestWithInstall.

[Evan Stade, 2015/12/17 22:56:06]

thanks for the pointer. Done.

+  ASSERT_TRUE(
+      RunExtensionTestIgnoreManifestWarnings("browser_action/multi_icons"))
+      << message_;
+  const Extension* extension = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension) << message_;
+
+  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());
+
+  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));
+}
+
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) {
   ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) <<
       message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   // Test that there is a browser action in the toolbar and that it has an icon.
   ASSERT_EQ(1, GetBrowserActionsBar()->NumberOfBrowserActions());
   EXPECT_TRUE(GetBrowserActionsBar()->HasIcon(0));
 
@@ skipping 383 matching lines @@
   std::string result;
   EXPECT_TRUE(
       content::ExecuteScriptAndExtractString(frame_host, script, &result));
   EXPECT_EQ("DONE", result);
 
   EXPECT_TRUE(actions_bar->HidePopup());
 }
 
 }  // namespace
 }  // namespace extensions