Handle more scale factors for extension Browser Action icons

chrome/browser/extensions/extension_action_manager_unittest.cc

 // Copyright 2014 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/browser/extensions/extension_action_manager.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ skipping 80 matching lines @@
 bool ExtensionActionManagerTest::TitlesMatch(const Extension& extension,
                                              const ExtensionAction& action) {
   return action.GetTitle(ExtensionAction::kDefaultTabId) == extension.name();
 }
 
 bool ExtensionActionManagerTest::IconsMatch(const Extension& extension,
                                             int extension_key,
                                             const ExtensionAction& action,
                                             int action_key) {
   return action.default_icon()->Get(action_key,
-                                    ExtensionIconSet::MATCH_EXACTLY) ==
-      IconsInfo::GetIcons(&extension).Get(extension_key,
-                                          ExtensionIconSet::MATCH_EXACTLY);
+                                    ExtensionIconSet::MATCH_BIGGER) ==
+         IconsInfo::GetIcons(&extension)
+             .Get(extension_key, ExtensionIconSet::MATCH_EXACTLY);
 }
 
 ExtensionAction* ExtensionActionManagerTest::GetAction(
     const char* action_type,
     const Extension& extension) {
   return (action_type == kBrowserAction) ?
       manager_->GetBrowserAction(extension) :
       manager_->GetPageAction(extension);
 }
 
 void ExtensionActionManagerTest::TestPopulateMissingValues(
     const char* action_type) {
   // Test that the largest icon from the extension's "icons" key is chosen as a
   // replacement for missing action default_icons keys. "19" should not be
   // replaced because "38" can always be used in its place.
   scoped_refptr<Extension> extension = BuildExtension(
       DictionaryBuilder().Set("48", "icon48.png")
                          .Set("128", "icon128.png"),
       DictionaryBuilder().Pass(),
       action_type);
 
   ASSERT_TRUE(extension.get());
   const ExtensionAction* action = GetAction(action_type, *extension.get());
   ASSERT_TRUE(action);
 
   ASSERT_TRUE(TitlesMatch(*extension.get(), *action));
-  ASSERT_TRUE(IconsMatch(*extension.get(), 128, *action, 38));
+  ASSERT_TRUE(IconsMatch(*extension.get(), 48, *action, 38));
 
   // Test that the action's missing default_icons are not replaced with smaller
   // icons.
   extension = BuildExtension(
       DictionaryBuilder().Set("24", "icon24.png"),
       DictionaryBuilder().Pass(),
       action_type);
 
   ASSERT_TRUE(extension.get());
   action = GetAction(action_type, *extension.get());
@@ skipping 76 matching lines @@
       manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER);
 
   // Now these values match because |extension| does not have page action
   // defaults.
   ASSERT_TRUE(TitlesMatch(*extension.get(), *action));
   ASSERT_TRUE(IconsMatch(*extension.get(), 48, *action, 38));
 }
 
 }  // namespace
 }  // namespace extensions