Select theme resources from ResourceBundle at requested scale factor.

ui/base/resource/data_pack_unittest.cc

Index: ui/base/resource/data_pack_unittest.cc
diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc
index 36be6fdf2d739c4c57817a4b0418ce03d2ccd9e8..1ac2145309ef2aeb4d98e4b60c3c2c345030560d 100644
--- a/ui/base/resource/data_pack_unittest.cc
+++ b/ui/base/resource/data_pack_unittest.cc
@@ -31,12 +31,14 @@ TEST(DataPackTest, Load) {
             static_cast<int>(kSamplePakSize));
 
   // Load the file through the data pack API.
-  DataPack pack(ResourceHandle::kScaleFactor100x);
+  DataPack pack(SCALE_FACTOR_100P);
   ASSERT_TRUE(pack.Load(data_path));
 
   base::StringPiece data;
+  ASSERT_TRUE(pack.HasResource(4));
   ASSERT_TRUE(pack.GetStringPiece(4, &data));
   EXPECT_EQ("this is id 4", data);
+  ASSERT_TRUE(pack.HasResource(6));
   ASSERT_TRUE(pack.GetStringPiece(6, &data));
   EXPECT_EQ("this is id 6", data);
 
@@ -47,6 +49,7 @@ TEST(DataPackTest, Load) {
   EXPECT_EQ(0U, data.length());
 
   // Try looking up an invalid key.
+  ASSERT_FALSE(pack.HasResource(140));
   ASSERT_FALSE(pack.GetStringPiece(140, &data));
 }
 
@@ -63,7 +66,7 @@ TEST(DataPackTest, LoadFileWithTruncatedHeader) {
   data_path = data_path.Append(FILE_PATH_LITERAL(
       "ui/base/test/data/data_pack_unittest/truncated-header.pak"));
 
-  DataPack pack(ResourceHandle::kScaleFactor100x);
+  DataPack pack(SCALE_FACTOR_100P);
   ASSERT_FALSE(pack.Load(data_path));
 }
 
@@ -87,7 +90,7 @@ TEST_P(DataPackTest, Write) {
   ASSERT_TRUE(DataPack::WritePack(file, resources, GetParam()));
 
   // Now try to read the data back in.
-  DataPack pack(ResourceHandle::kScaleFactor100x);
+  DataPack pack(SCALE_FACTOR_100P);
   ASSERT_TRUE(pack.Load(file));
   EXPECT_EQ(pack.GetTextEncodingType(), GetParam());