Revert "Switch to using .pak files for locale data on Windows." (r97941)

ui/base/resource/resource_bundle.h

Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index 7076a6ea6136571f1d6bf407a8b6f3c1315da107..37d3ef19351476fc56f65c6078dc6bc8c82b7f5f 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -83,10 +83,6 @@ class UI_EXPORT ResourceBundle {
   // Initialize the ResourceBundle using given data pack path for testing.
   static void InitSharedInstanceForTest(const FilePath& path);
 
-  // Load a .pak file.  Returns NULL if we fail to load |path|.  The caller
-  // is responsible for deleting up this pointer.
-  static DataPack* LoadResourcesDataPak(const FilePath& path);
-
   // Changes the locale for an already-initialized ResourceBundle.  Future
   // calls to get strings will return the strings for this new locale.  This
   // has no effect on existing or future image resources.  This has no effect
@@ -275,9 +271,7 @@ class UI_EXPORT ResourceBundle {
   // Handles for data sources.
   DataHandle resources_data_;
   DataHandle large_icon_resources_data_;
-#if !defined(NACL_WIN64)
-  scoped_ptr<DataPack> locale_resources_data_;
-#endif
+  DataHandle locale_resources_data_;
 
   // References to extra data packs loaded via AddDataPackToSharedInstance.
   std::vector<LoadedDataPack*> data_packs_;