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

chrome/tools/mac_helpers/infoplist_strings_util.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.
 
 // Helper tool that is built and run during a build to pull strings from
 // the GRD files and generate the InfoPlist.strings files needed for
 // Mac OS X app bundles.
 
 #import <Foundation/Foundation.h>
 
@@ skipping 42 matching lines @@
 
 ui::DataPack* LoadResourceDataPack(const char* dir_path,
                                    const char* branding_strings_name,
                                    const char* locale_name) {
   ui::DataPack* resource_pack = NULL;
 
   NSString* resource_path = [NSString stringWithFormat:@"%s/%s_%s.pak",
                              dir_path, branding_strings_name, locale_name];
   if (resource_path) {
     FilePath resources_pak_path([resource_path fileSystemRepresentation]);
-    resource_pack = new ui::DataPack(ui::ResourceHandle::kScaleFactor100x);
+    resource_pack = new ui::DataPack(ui::SCALE_FACTOR_100P);
     bool success = resource_pack->Load(resources_pak_path);
     if (!success) {
       delete resource_pack;
       resource_pack = NULL;
     }
   }
 
   return resource_pack;
 }
 
@@ skipping 234 matching lines @@
         [output_path stringByAppendingPathComponent:@"InfoPlist.strings"];
     if (![strings_file_contents_utf8 writeToFile:output_path
                                       atomically:YES]) {
       fprintf(stderr, "ERROR: Failed to write out '%s'\n",
               [output_path UTF8String]);
       exit(1);
     }
   }
   return 0;
 }