Merge themes/default.pak into chrome.pak for Mac and Linux builds.

app/resource_bundle_mac.mm

Index: app/resource_bundle_mac.mm
diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm
index 0bde757d593bd301e30611803a8ae7fa172eb590..7a6139f7d5256e50b4b40c9f708fbbc780e7007b 100644
--- a/app/resource_bundle_mac.mm
+++ b/app/resource_bundle_mac.mm
@@ -24,10 +24,9 @@ ResourceBundle::~ResourceBundle() {
 
   delete locale_resources_data_;
   locale_resources_data_ = NULL;
-  delete theme_data_;
-  theme_data_ = NULL;
   delete resources_data_;
   resources_data_ = NULL;
+  theme_data_ = NULL;
 }
 
 namespace {
@@ -66,9 +65,10 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
 }
 
 void ResourceBundle::LoadThemeResources() {
-  DCHECK(theme_data_ == NULL) << "theme data already loaded!";
-  theme_data_ = LoadResourceDataPack(@"theme");
-  DCHECK(theme_data_) << "failed to load theme.pak";
+  // The data has been merged with chrome.pak so just set the pointer to be
+  // the same file.
+  DCHECK(resources_data_);
+  theme_data_ = resources_data_;
 }
 
 // static