Revert 100973 - Updated *.pak file format to support both UTF8 and UTF16

Chromeframe tests started failing with this, see:

http://build.chromium.org/p/chromium/builders/Chrome%20Frame%20Tests%20%28ie6%29/builds/14472/steps/chrome_frame_tests/logs/stdio
http://build.chromium.org/p/chromium/builders/Chrome%20Frame%20Tests%20%28ie7%29/builds/14446/steps/chrome_frame_tests/logs/stdio
http://build.chromium.org/p/chromium/builders/Chrome%20Frame%20Tests%20%28ie8%29/builds/14187/steps/chrome_frame_tests/logs/stdio

FullTabDownloadTest.TopLevelPostReissueFromChromeFramePage: 
Did not complete.



[----------] 2 tests from FullTabDownloadTest
[ RUN      ] FullTabDownloadTest.CF_DownloadFileFromPost
[       OK ] FullTabDownloadTest.CF_DownloadFileFromPost (16 ms)
[ RUN      ] FullTabDownloadTest.TopLevelPostReissueFromChromeFramePage
[712:3268:0913/153614:1242640:INFO:chrome_frame_test_utils.h(89)] chrome_frame_test::HungCOMCallDetector::~HungCOMCallDetector
[712:3268:0913/153614:1242640:INFO:navigation_test.cc(753)] Not running test on Vista with IE7
[712:3268:0913/153614:1242656:INFO:chrome_frame_test_utils.h(85)] chrome_frame_test::HungCOMCallDetector::HungCOMCallDetector




Inserted a new field in the header that specifies which encoding is to be used for the text resources.

I also upped file format to version 4.

BUG=76281
TEST=unit_tests


Review URL: http://codereview.chromium.org/7744017

TBR=adriansc@chromium.org
Review URL: http://codereview.chromium.org/7891028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101004 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 19 deletions

diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h
index 0cc3b31..f6ee78d 100644
--- a/ui/base/resource/data_pack.h
+++ b/ui/base/resource/data_pack.h
@@ -31,13 +31,6 @@ namespace ui {
 
 class UI_EXPORT DataPack {
  public:
-  // What type of encoding the text resources use.
-  enum TextEncodingType {
-    BINARY,
-    UTF8,
-    UTF16
-  };
-
   DataPack();
   ~DataPack();
 
@@ -54,16 +47,9 @@ class UI_EXPORT DataPack {
   // for localization strings.
   RefCountedStaticMemory* GetStaticMemory(uint16 resource_id) const;
 
-  // Writes a pack file containing |resources| to |path|. If there are any
-  // text resources to be written, their encoding must already agree to the
-  // |textEncodingType| specified. If no text resources are present, please
-  // indicate BINARY.
+  // Writes a pack file containing |resources| to |path|.
   static bool WritePack(const FilePath& path,
-                        const std::map<uint16, base::StringPiece>& resources,
-                        TextEncodingType textEncodingType);
-
-  // Get the encoding type of text resources.
-  TextEncodingType GetTextEncodingType() const { return text_encoding_type_; }
+                        const std::map<uint16, base::StringPiece>& resources);
 
  private:
   // The memory-mapped data.
@@ -72,9 +58,6 @@ class UI_EXPORT DataPack {
   // Number of resources in the data.
   size_t resource_count_;
 
-  // Type of encoding for text resources.
-  TextEncodingType text_encoding_type_;
-
   DISALLOW_COPY_AND_ASSIGN(DataPack);
 };