Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

ui/base/resource/data_pack_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/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_piece.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 13 matching lines @@
 TEST(DataPackTest, Load) {
   ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   FilePath data_path = dir.path().Append(FILE_PATH_LITERAL("sample.pak"));
 
   // Dump contents into the pak file.
   ASSERT_EQ(file_util::WriteFile(data_path, kSamplePakContents, kSamplePakSize),
             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);
 
   // Try reading zero-length data blobs, just in case.
   ASSERT_TRUE(pack.GetStringPiece(1, &data));
   EXPECT_EQ(0U, data.length());
   ASSERT_TRUE(pack.GetStringPiece(10, &data));
   EXPECT_EQ(0U, data.length());
 
   // Try looking up an invalid key.
+  ASSERT_FALSE(pack.HasResource(140));
   ASSERT_FALSE(pack.GetStringPiece(140, &data));
 }
 
 INSTANTIATE_TEST_CASE_P(WriteBINARY, DataPackTest, ::testing::Values(
     DataPack::BINARY));
 INSTANTIATE_TEST_CASE_P(WriteUTF8, DataPackTest, ::testing::Values(
     DataPack::UTF8));
 INSTANTIATE_TEST_CASE_P(WriteUTF16, DataPackTest, ::testing::Values(
     DataPack::UTF16));
 
 TEST(DataPackTest, LoadFileWithTruncatedHeader) {
   FilePath data_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &data_path);
   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));
 }
 
 TEST_P(DataPackTest, Write) {
   ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   FilePath file = dir.path().Append(FILE_PATH_LITERAL("data.pak"));
 
   std::string one("one");
   std::string two("two");
   std::string three("three");
   std::string four("four");
   std::string fifteen("fifteen");
 
   std::map<uint16, base::StringPiece> resources;
   resources.insert(std::make_pair(1, base::StringPiece(one)));
   resources.insert(std::make_pair(2, base::StringPiece(two)));
   resources.insert(std::make_pair(15, base::StringPiece(fifteen)));
   resources.insert(std::make_pair(3, base::StringPiece(three)));
   resources.insert(std::make_pair(4, base::StringPiece(four)));
   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());
 
   base::StringPiece data;
   ASSERT_TRUE(pack.GetStringPiece(1, &data));
   EXPECT_EQ(one, data);
   ASSERT_TRUE(pack.GetStringPiece(2, &data));
   EXPECT_EQ(two, data);
   ASSERT_TRUE(pack.GetStringPiece(3, &data));
   EXPECT_EQ(three, data);
   ASSERT_TRUE(pack.GetStringPiece(4, &data));
   EXPECT_EQ(four, data);
   ASSERT_TRUE(pack.GetStringPiece(15, &data));
   EXPECT_EQ(fifteen, data);
 }
 
 }  // namespace ui