Removed sample.pak binary from checkout.

Replaced by hexa literal in the two ui_unittests that need it.

This will make any later changes easier to perform, and it also eliminates the
problem of having binary files which are ignored by patches in the repo.

BUG=none
TEST=ui_unittest:{DataPackTest.*, ResourceBundle.*}


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

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

5 files changed, 48 insertions, 8 deletions

diff --git a/ui/base/resource/data_pack_literal.cc b/ui/base/resource/data_pack_literal.cc
new file mode 100644
index 0000000..4a32fa9
--- /dev/null
+++ b/ui/base/resource/data_pack_literal.cc
@@ -0,0 +1,23 @@
+// Copyright (c) 2011 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 "base/basictypes.h"
+
+namespace ui {
+
+extern const char kSamplePakContents[] = {
+    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'
+};
+
+extern const size_t kSamplePakSize = sizeof(kSamplePakContents);
+
+}  // namespace ui
diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc
index 032196f..fe3613c 100644
--- a/ui/base/resource/data_pack_unittest.cc
+++ b/ui/base/resource/data_pack_unittest.cc
@@ -12,12 +12,19 @@
 
 namespace ui {
 
+extern const char kSamplePakContents[];
+extern const size_t kSamplePakSize;
+
 TEST(DataPackTest, Load) {
-  FilePath data_path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &data_path);
-  data_path = data_path.Append(
-      FILE_PATH_LITERAL("ui/base/test/data/data_pack_unittest/sample.pak"));
+  ScopedTempDir dir;
+  ASSERT_TRUE(dir.CreateUniqueTempDir());
+  FilePath data_path = dir.path().Append(FILE_PATH_LITERAL("sample.pak"));
+
+  // Dump contents into the pak file.
+  ASSERT_EQ(file_util::WriteFile(data_path, kSamplePakContents, kSamplePakSize),
+            static_cast<int>(kSamplePakSize));
 
+  // Load the file through the data pack API.
   DataPack pack;
   ASSERT_TRUE(pack.Load(data_path));
 
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index f778588..83a53d5 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -6,11 +6,16 @@
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
+#include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 
+extern const char kSamplePakContents[];
+extern const size_t kSamplePakSize;
+
 TEST(ResourceBundle, LoadDataResourceBytes) {
   // Verify that we don't crash when trying to load a resource that is not
   // found.  In some cases, we fail to mmap resources.pak, but try to keep
@@ -19,11 +24,15 @@ TEST(ResourceBundle, LoadDataResourceBytes) {
 
   // On Windows, the default data is compiled into the binary so this does
   // nothing.
-  FilePath data_path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &data_path);
-  data_path = data_path.Append(
-      FILE_PATH_LITERAL("ui/base/test/data/data_pack_unittest/sample.pak"));
+  ScopedTempDir dir;
+  ASSERT_TRUE(dir.CreateUniqueTempDir());
+  FilePath data_path = dir.path().Append(FILE_PATH_LITERAL("sample.pak"));
+
+  // Dump contents into the pak file.
+  ASSERT_EQ(file_util::WriteFile(data_path, kSamplePakContents, kSamplePakSize),
+            static_cast<int>(kSamplePakSize));
 
+  // Create a resource bundle from the file.
   resource_bundle.LoadTestResources(data_path);
 
   const int kUnfoundResourceId = 10000;
diff --git a/ui/base/test/data/data_pack_unittest/sample.pak b/ui/base/test/data/data_pack_unittest/sample.pak
deleted file mode 100644
index 5c49319..0000000
--- a/ui/base/test/data/data_pack_unittest/sample.pak
+++ /dev/null
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index b395588..60ad9f6 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -34,6 +34,7 @@
         'base/range/range_unittest.cc',
         'base/range/range_mac_unittest.mm',
         'base/range/range_win_unittest.cc',
+        'base/resource/data_pack_literal.cc',
         'base/resource/data_pack_unittest.cc',
         'base/resource/resource_bundle_unittest.cc',
         'base/text/bytes_formatting_unittest.cc',