properly initialize resource manager on mac for unittests.

chrome/common/resource_bundle_mac.mm

 // Copyright (c) 2006-2008 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 "chrome/common/resource_bundle.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/base_paths.h"
 #include "base/data_pack.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/mac_util.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/l10n_util.h"
 
+
 ResourceBundle::~ResourceBundle() {
   FreeImages();
 
   delete locale_resources_data_;
   locale_resources_data_ = NULL;
   delete theme_data_;
   theme_data_ = NULL;
   delete resources_data_;
   resources_data_ = NULL;
 }
 
 namespace {
 
 base::DataPack *LoadResourceDataPack(NSString *name) {
   base::DataPack *resource_pack = NULL;
   
+  NSString * const pakExt = @"pak";

[Mark Mentovai, 2009/02/26 17:44:03]

Never put space on both sides of the *.

+  
+  // TODO(thomasvl): THIS SUCKS!  We need to remove this gate.  It's here
+  // because of the unittests, but we have no other way to find our resources.
+  if (!mac_util::AmIBundled()) {
+    FilePath path;
+    PathService::Get(base::DIR_EXE, &path);
+    path = path.AppendASCII("Chromium.app");
+    path = path.AppendASCII("Contents");
+    path = path.AppendASCII("Resources");
+    if ([name isEqual:@"locale"]) {
+      path = path.AppendASCII("English.lproj");
+    }
+    NSString *pakName = [name stringByAppendingPathExtension:pakExt];
+    path = path.Append([pakName fileSystemRepresentation]);
+    resource_pack = new base::DataPack;
+    bool success = resource_pack->Load(path);
+    DCHECK(success) << "failed to load chrome.pak";

[Mark Mentovai, 2009/02/27 06:07:59]

Shoulda caught this before, but this shouldn't hard-code chrome.pak.

+    if (!success) {
+      delete resource_pack;
+      resource_pack = NULL;
+    }
+    return resource_pack;
+  }
+
   NSString *resource_path = [[NSBundle mainBundle] pathForResource:name
-                                                            ofType:@"pak"];
+                                                            ofType:pakExt];
   if (resource_path) {
     FilePath resources_pak_path([resource_path fileSystemRepresentation]);
     resource_pack = new base::DataPack;
     bool success = resource_pack->Load(resources_pak_path);
     DCHECK(success) << "failed to load chrome.pak";

[Mark Mentovai, 2009/02/27 06:07:59]

Ditto.

     if (!success) {
       delete resource_pack;
       resource_pack = NULL;
     }
   }
   
   return resource_pack;
 }
 
 }  // namespace
 
 void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
-  DCHECK(pref_locale.size() == 0)
-      << "ignoring requested locale in favore of NSBundle's selection";
+  DLOG_IF(WARNING, pref_locale.size() != 0)
+      << "ignoring requested locale in favor of NSBundle's selection";
   
   DCHECK(resources_data_ == NULL) << "resource data already loaded!";
   resources_data_ = LoadResourceDataPack(@"chrome");
   DCHECK(resources_data_) << "failed to load chrome.pak";
 
   DCHECK(locale_resources_data_ == NULL) << "locale data already loaded!";
   locale_resources_data_ = LoadResourceDataPack(@"locale");
   DCHECK(locale_resources_data_) << "failed to load locale.pak";
 }
 
@@ skipping 42 matching lines @@
       NOTREACHED() << "unable to find resource: " << message_id;
       return std::wstring();
     }
   }
 
   // Data pack encodes strings as UTF16.
   string16 msg(reinterpret_cast<const char16*>(data.data()),
                data.length() / 2);
   return UTF16ToWide(msg);
 }