Add methods to add DataPack from open files

ui/base/resource/resource_bundle_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 "ui/base/resource/resource_bundle.h"
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 71 matching lines @@
   FilePath pack_path(FILE_PATH_LITERAL("/path/to/test_path.pak"));
   ui::ScaleFactor pack_scale_factor = ui::SCALE_FACTOR_200P;
 
   EXPECT_CALL(delegate,
       GetPathForResourcePack(
           Property(&FilePath::value, pack_path.value()),
           pack_scale_factor))
       .Times(1)
       .WillOnce(Return(pack_path));
 
-  resource_bundle.AddDataPack(pack_path, pack_scale_factor);
+  resource_bundle.AddDataPackFromPath(pack_path, pack_scale_factor);
 }
 
 TEST(ResourceBundle, DelegateGetPathForLocalePack) {
   MockResourceBundleDelegate delegate;
   ResourceBundle resource_bundle(&delegate);
 
   std::string locale = "en-US";
 
   // Cancel the load.
   EXPECT_CALL(delegate, GetPathForLocalePack(_, locale))
@@ skipping 141 matching lines @@
               static_cast<int>(kSamplePakSize));
 
     // Create a resource bundle from the file.
     resource_bundle.LoadTestResources(data_path, data_path);
 
     const int kUnfoundResourceId = 10000;
     EXPECT_EQ(NULL, resource_bundle.LoadDataResourceBytes(
         kUnfoundResourceId, ui::SCALE_FACTOR_NONE));
 
     // Give a .pak file that doesn't exist so we will fail to load it.
-    resource_bundle.AddDataPack(
+    resource_bundle.AddDataPackFromPath(
         FilePath(FILE_PATH_LITERAL("non-existant-file.pak")),
         ui::SCALE_FACTOR_NONE);
     EXPECT_EQ(NULL, resource_bundle.LoadDataResourceBytes(
         kUnfoundResourceId, ui::SCALE_FACTOR_NONE));
   }
 }
 
 TEST(ResourceBundle, GetRawDataResource) {
 
   // On Windows, the default data is compiled into the binary so this does
   // nothing.
   ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   FilePath locale_path = dir.path().Append(FILE_PATH_LITERAL("empty.pak"));
   FilePath data_path = dir.path().Append(FILE_PATH_LITERAL("sample.pak"));
   FilePath data_2x_path = dir.path().Append(FILE_PATH_LITERAL("sample_2x.pak"));
 
   {
     ResourceBundle resource_bundle(NULL);
     // Dump contents into the pak files.
     ASSERT_EQ(file_util::WriteFile(locale_path, kEmptyPakContents,
         kEmptyPakSize), static_cast<int>(kEmptyPakSize));
     ASSERT_EQ(file_util::WriteFile(data_path, kSamplePakContents,
         kSamplePakSize), static_cast<int>(kSamplePakSize));
     ASSERT_EQ(file_util::WriteFile(data_2x_path, kSamplePakContents2x,
         kSamplePakSize2x), static_cast<int>(kSamplePakSize2x));
 
     // Load the regular and 2x pak files.
     resource_bundle.LoadTestResources(data_path, locale_path);
-    resource_bundle.AddDataPack(data_2x_path, SCALE_FACTOR_200P);
+    resource_bundle.AddDataPackFromPath(data_2x_path, SCALE_FACTOR_200P);
 
     // Resource ID 4 exists in both 1x and 2x paks, so we expect a different
     // result when requesting the 2x scale.
     EXPECT_EQ("this is id 4", resource_bundle.GetRawDataResource(4,
         SCALE_FACTOR_100P));
     EXPECT_EQ("this is id 4 2x", resource_bundle.GetRawDataResource(4,
         SCALE_FACTOR_200P));
 
     // Resource ID 6 only exists in the 1x pak so we expect the same resource
     // for both scale factor requests.
     EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResource(6,
         SCALE_FACTOR_100P));
     EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResource(6,
         SCALE_FACTOR_200P));
   }
 }
 
 TEST(ResourceBundle, LocaleDataPakExists) {
   ResourceBundle resource_bundle(NULL);
 
   // Check that ResourceBundle::LocaleDataPakExists returns the correct results.
   EXPECT_TRUE(resource_bundle.LocaleDataPakExists("en-US"));
   EXPECT_FALSE(resource_bundle.LocaleDataPakExists("not_a_real_locale"));
 }
 
 }  // namespace ui