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

5 files changed, 21 insertions, 90 deletions

diff --git a/ui/base/resource/data_pack.cc b/ui/base/resource/data_pack.cc
index 5a0dcf1..c4b1594 100644
--- a/ui/base/resource/data_pack.cc
+++ b/ui/base/resource/data_pack.cc
@@ -17,9 +17,9 @@
 
 namespace {
 
-static const uint32 kFileFormatVersion = 4;
-// Length of file header: version, entry count and text encoding type.
-static const size_t kHeaderLength = 2 * sizeof(uint32) + sizeof(uint8);
+static const uint32 kFileFormatVersion = 3;
+// Length of file header: version and entry count.
+static const size_t kHeaderLength = 2 * sizeof(uint32);
 
 #pragma pack(push,2)
 struct DataPackEntry {
@@ -60,7 +60,7 @@ enum LoadErrors {
 namespace ui {
 
 // In .cc for MemoryMappedFile dtor.
-DataPack::DataPack() : resource_count_(0), text_encoding_type_(BINARY) {
+DataPack::DataPack() : resource_count_(0) {
 }
 DataPack::~DataPack() {
 }
@@ -83,7 +83,7 @@ bool DataPack::Load(const FilePath& path) {
   }
 
   // Parse the header of the file.
-  // First uint32: version; second: resource count;
+  // First uint32: version; second: resource count.
   const uint32* ptr = reinterpret_cast<const uint32*>(mmap_->data());
   uint32 version = ptr[0];
   if (version != kFileFormatVersion) {
@@ -96,17 +96,6 @@ bool DataPack::Load(const FilePath& path) {
   }
   resource_count_ = ptr[1];
 
-  // third: text encoding.
-  const uint8* ptr_encoding = reinterpret_cast<const uint8*>(ptr + 2);
-  text_encoding_type_ = static_cast<TextEncodingType>(*ptr_encoding);
-  if (text_encoding_type_ != UTF8 && text_encoding_type_ != UTF16 &&
-      text_encoding_type_ != BINARY) {
-    LOG(ERROR) << "Bad data pack text encoding: got " << text_encoding_type_
-               << ", expected between " << BINARY << " and " << UTF16;
-    mmap_.reset();
-    return false;
-  }
-
   // Sanity check the file.
   // 1) Check we have enough entries.
   if (kHeaderLength + resource_count_ * sizeof(DataPackEntry) >
@@ -174,8 +163,7 @@ RefCountedStaticMemory* DataPack::GetStaticMemory(uint16 resource_id) const {
 
 // static
 bool DataPack::WritePack(const FilePath& path,
-                         const std::map<uint16, base::StringPiece>& resources,
-                         TextEncodingType textEncodingType) {
+                         const std::map<uint16, base::StringPiece>& resources) {
   FILE* file = file_util::OpenFile(path, "wb");
   if (!file)
     return false;
@@ -195,21 +183,6 @@ bool DataPack::WritePack(const FilePath& path,
     return false;
   }
 
-  if (textEncodingType != UTF8 && textEncodingType != UTF16 &&
-      textEncodingType != BINARY) {
-    LOG(ERROR) << "Invalid text encoding type, got " << textEncodingType
-               << ", expected between " << BINARY << " and " << UTF16;
-    file_util::CloseFile(file);
-    return false;
-  }
-
-  uint8 write_buffer = textEncodingType;
-  if (fwrite(&write_buffer, sizeof(uint8), 1, file) != 1) {
-    LOG(ERROR) << "Failed to write file text resources encoding";
-    file_util::CloseFile(file);
-    return false;
-  }
-
   // Each entry is a uint16 + a uint32. We have an extra entry after the last
   // item so we can compute the size of the list item.
   uint32 index_length = (entry_count + 1) * sizeof(DataPackEntry);
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);
 };
 
diff --git a/ui/base/resource/data_pack_literal.cc b/ui/base/resource/data_pack_literal.cc
index 510d07a..4a32fa9 100644
--- a/ui/base/resource/data_pack_literal.cc
+++ b/ui/base/resource/data_pack_literal.cc
@@ -7,14 +7,13 @@
 namespace ui {
 
 extern const char kSamplePakContents[] = {
-    0x04, 0x00, 0x00, 0x00,               // header(version
-    0x04, 0x00, 0x00, 0x00,               //        no. entries
-    0x01,                                 //        encoding)
-    0x01, 0x00, 0x27, 0x00, 0x00, 0x00,   // index entry 1
-    0x04, 0x00, 0x27, 0x00, 0x00, 0x00,   // index entry 4
-    0x06, 0x00, 0x33, 0x00, 0x00, 0x00,   // index entry 6
-    0x0a, 0x00, 0x3f, 0x00, 0x00, 0x00,   // index entry 10
-    0x00, 0x00, 0x3f, 0x00, 0x00, 0x00,   // extra entry for the size of last
+    0x03, 0x00, 0x00, 0x00,               // header(version
+    0x04, 0x00, 0x00, 0x00,               //        no. entries)
+    0x01, 0x00, 0x26, 0x00, 0x00, 0x00,   // index entry 1
+    0x04, 0x00, 0x26, 0x00, 0x00, 0x00,   // index entry 4
+    0x06, 0x00, 0x32, 0x00, 0x00, 0x00,   // index entry 6
+    0x0a, 0x00, 0x3e, 0x00, 0x00, 0x00,   // index entry 10
+    0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,   // extra entry for the size of last
     't', 'h', 'i', 's', ' ', 'i', 's', ' ', 'i', 'd', ' ', '4',
     't', 'h', 'i', 's', ' ', 'i', 's', ' ', 'i', 'd', ' ', '6'
 };
diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc
index 1c0bd7a..fe3613c 100644
--- a/ui/base/resource/data_pack_unittest.cc
+++ b/ui/base/resource/data_pack_unittest.cc
@@ -12,12 +12,6 @@
 
 namespace ui {
 
-class DataPackTest
-    : public testing::TestWithParam<DataPack::TextEncodingType> {
- public:
-  DataPackTest() {}
-};
-
 extern const char kSamplePakContents[];
 extern const size_t kSamplePakSize;
 
@@ -50,13 +44,6 @@ TEST(DataPackTest, Load) {
   ASSERT_FALSE(pack.GetStringPiece(140, &data));
 }
 
-INSTANTIATE_TEST_CASE_P(WriteBINARY, DataPackTest, ::testing::Values(
-    DataPack::BINARY));
-INSTANTIATE_TEST_CASE_P(WriteUTF8, DataPackTest, ::testing::Values(
-    DataPack::UTF8));
-INSTANTIATE_TEST_CASE_P(WriteUTF16, DataPackTest, ::testing::Values(
-    DataPack::UTF16));
-
 TEST(DataPackTest, LoadFileWithTruncatedHeader) {
   FilePath data_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &data_path);
@@ -67,7 +54,7 @@ TEST(DataPackTest, LoadFileWithTruncatedHeader) {
   ASSERT_FALSE(pack.Load(data_path));
 }
 
-TEST_P(DataPackTest, Write) {
+TEST(DataPackTest, Write) {
   ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   FilePath file = dir.path().Append(FILE_PATH_LITERAL("data.pak"));
@@ -84,12 +71,11 @@ TEST_P(DataPackTest, Write) {
   resources.insert(std::make_pair(15, base::StringPiece(fifteen)));
   resources.insert(std::make_pair(3, base::StringPiece(three)));
   resources.insert(std::make_pair(4, base::StringPiece(four)));
-  ASSERT_TRUE(DataPack::WritePack(file, resources, GetParam()));
+  ASSERT_TRUE(DataPack::WritePack(file, resources));
 
   // Now try to read the data back in.
   DataPack pack;
   ASSERT_TRUE(pack.Load(file));
-  EXPECT_EQ(pack.GetTextEncodingType(), GetParam());
 
   base::StringPiece data;
   ASSERT_TRUE(pack.GetStringPiece(1, &data));
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index a030251..04cf392 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -11,7 +11,6 @@
 #include "base/stl_util.h"
 #include "base/string_piece.h"
 #include "base/synchronization/lock.h"
-#include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -186,19 +185,10 @@ string16 ResourceBundle::GetLocalizedString(int message_id) {
     }
   }
 
-  // Strings should not be loaded from a data pack that contains binary data.
-  DCHECK(locale_resources_data_->GetTextEncodingType() == DataPack::UTF16 ||
-         locale_resources_data_->GetTextEncodingType() == DataPack::UTF8)
-      << "requested localized string from binary pack file";
-
-  // Data pack encodes strings as either UTF8 or UTF16.
-  string16 msg;
-  if (locale_resources_data_->GetTextEncodingType() == DataPack::UTF16) {
-    msg = string16(reinterpret_cast<const char16*>(data.data()),
-                   data.length() / 2);
-  } else if (locale_resources_data_->GetTextEncodingType() == DataPack::UTF8) {
-    msg = UTF8ToUTF16(data);
-  }
+  // Data pack encodes strings as UTF16.
+  DCHECK_EQ(data.length() % 2, 0U);
+  string16 msg(reinterpret_cast<const char16*>(data.data()),
+               data.length() / 2);
   return msg;
 }