Add methods to add DataPack from open files

ui/base/resource/resource_bundle_mac.mm

 // 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"
 
 #import <AppKit/AppKit.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 31 matching lines @@
     // Return just the name of the pack file.
     return FilePath(base::SysNSStringToUTF8(name) + ".pak");
   }
 
   return FilePath([resource_path fileSystemRepresentation]);
 }
 
 }  // namespace
 
 void ResourceBundle::LoadCommonResources() {
-  AddDataPack(GetResourcesPakFilePath(@"chrome", nil),
-              SCALE_FACTOR_100P);
-  AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil),
-              SCALE_FACTOR_100P);
-  AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil),
-              SCALE_FACTOR_100P);
+  AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
+                      SCALE_FACTOR_100P);
+  AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_standard", nil),
+                      SCALE_FACTOR_100P);
+  AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_standard", nil),
+                      SCALE_FACTOR_100P);
 
   // On Windows and ChromeOS we load either the 1x resource or the 2x resource.
   // On Mac we load both and let the UI framework decide which one to use.
 #if defined(ENABLE_HIDPI)
   if (base::mac::IsOSLionOrLater()) {
-    AddDataPack(GetResourcesPakFilePath(@"theme_resources_2x", nil),
-                SCALE_FACTOR_200P);
-    AddDataPack(GetResourcesPakFilePath(@"ui_resources_2x", nil),
-                SCALE_FACTOR_200P);
+    AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_2x", nil),
+                        SCALE_FACTOR_200P);
+    AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_2x", nil),
+                        SCALE_FACTOR_200P);
   }
 #endif
 }
 
-FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) {
+FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
+                                           bool test_file_exists) {
   NSString* mac_locale = base::SysUTF8ToNSString(app_locale);
 
   // Mac OS X uses "_" instead of "-", so swap to get a Mac-style value.
   mac_locale = [mac_locale stringByReplacingOccurrencesOfString:@"-"
                                                      withString:@"_"];
 
   // On disk, the "en_US" resources are just "en" (http://crbug.com/25578).
   if ([mac_locale isEqual:@"en_US"])
     mac_locale = @"en";
 
   FilePath locale_file_path = GetResourcesPakFilePath(@"locale", mac_locale);
 
   if (delegate_) {
     locale_file_path =
         delegate_->GetPathForLocalePack(locale_file_path, app_locale);
   }
 
   // Don't try to load empty values or values that are not absolute paths.
   if (locale_file_path.empty() || !locale_file_path.IsAbsolute())
     return FilePath();
 
-  if (!file_util::PathExists(locale_file_path))
+  if (test_file_exists && !file_util::PathExists(locale_file_path))
     return FilePath();
 
   return locale_file_path;
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
   // Flipped images are not used on Mac.
   DCHECK_EQ(rtl, RTL_DISABLED);
 
   // Check to see if the image is already in the cache.
@@ skipping 47 matching lines @@
 
   // Another thread raced the load and has already cached the image.
   if (images_.count(resource_id))
     return images_[resource_id];
 
   images_[resource_id] = image;
   return images_[resource_id];
 }
 
 }  // namespace ui