Add a macutil for the main app bundle and override...

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"
@@ skipping 18 matching lines @@
   theme_data_ = NULL;
   delete resources_data_;
   resources_data_ = NULL;
 }
 
 namespace {
 
 base::DataPack *LoadResourceDataPack(NSString *name) {
   base::DataPack *resource_pack = NULL;
   
-  NSString *const pakExt = @"pak";
-  
-  // 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("en.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";
-    if (!success) {
-      delete resource_pack;
-      resource_pack = NULL;
-    }
-    return resource_pack;
-  }
-
-  NSString *resource_path = [[NSBundle mainBundle] pathForResource:name
-                                                            ofType:pakExt];
+  NSString *resource_path = [mac_util::MainAppBundle() pathForResource:name
+                                                                ofType:@"pak"];
   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";
     if (!success) {
       delete resource_pack;
       resource_pack = NULL;
     }
   }
@@ skipping 61 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);
 }