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

app/resource_bundle_linux.cc

Index: app/resource_bundle_linux.cc
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
index 10d5caa0bf9679763c8a27afed0f8aa25b8371ab..1fe4cb6e4afbb14a9119fdb23d07aed2e3a5881b 100644
--- a/app/resource_bundle_linux.cc
+++ b/app/resource_bundle_linux.cc
@@ -67,10 +67,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;
 }
 
 void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
@@ -109,12 +108,10 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
 }
 
 void ResourceBundle::LoadThemeResources() {
-  FilePath theme_data_path;
-  PathService::Get(app::DIR_THEMES, &theme_data_path);
-  theme_data_path = theme_data_path.Append(FILE_PATH_LITERAL("default.pak"));
-  theme_data_ = new base::DataPack;
-  bool success = theme_data_->Load(theme_data_path);
-  DCHECK(success) << "failed to load theme data";
+  // 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