Load extension icons for more scale factors.

chrome/browser/extensions/extension_icon_manager_unittest.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 "base/command_line.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/common/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
+#include "ui/display/display_switches.h"
+#include "ui/display/test/test_screen.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/gfx/skia_util.h"
 
 namespace extensions {
 namespace {
 
 using content::BrowserThread;
@@ skipping 230 matching lines @@
          scale_factor_iter < ui::NUM_SCALE_FACTORS; ++scale_factor_iter) {
       auto scale_factor = static_cast<ui::ScaleFactor>(scale_factor_iter);
       float scale = ui::GetScaleForScaleFactor(scale_factor);
       SCOPED_TRACE(testing::Message() << "Scale: " << scale);
 
       const bool has_representation = image_skia.HasRepresentation(scale);
       // We shouldn't have a representation if the extension didn't provide a
       // big enough icon.
       if (gfx::kFaviconSize * scale > kMaxIconSizeInManifest)
         EXPECT_FALSE(has_representation);
-      else
-        EXPECT_EQ(ui::IsSupportedScale(scale), has_representation);
+      else if (ui::IsSupportedScale(scale))

[Devlin, 2017/01/09 21:58:33]

if it's *not* a supported scale, can we assert that we don't have a
representation (since presumably we don't have a screen here)?

[Devlin, 2017/01/13 15:53:47]

ping on this one

[Evan Stade, 2017/01/17 19:07:11]

sorry for not responding. I reverted this change.

+        EXPECT_TRUE(has_representation);
     }
   }
+
+  // Now check that the DSFs for active displays are respected.
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kForceDeviceScaleFactor, "1.5");
+  display::test::TestScreen test_screen;
+  display::Screen::SetScreenInstance(&test_screen);
+  TestIconManager icon_manager(this);
+
+  icon_manager.LoadIcon(profile.get(), extension.get());
+  WaitForImageLoad();
+  gfx::ImageSkia icon = icon_manager.GetIcon(extension->id()).AsImageSkia();
+  EXPECT_TRUE(icon.HasRepresentation(1.5f));
+  display::Screen::SetScreenInstance(nullptr);
 }
 
 }  // namespace
 }  // namespace extensions