Merge 143502 - mac: Fix ui_resource_2x data pack path.

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 44 matching lines @@
               SCALE_FACTOR_100P);
   AddDataPack(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(@"theme_resources_standard_2x", nil),
-                SCALE_FACTOR_200P);
-    AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil),
+    AddDataPack(GetResourcesPakFilePath(@"ui_resources_2x", nil),
                 SCALE_FACTOR_200P);
   }
 #endif
 }
 
 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) {
   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:@"-"
@@ skipping 75 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