Mac: Let browser_tests run in bundled mode for their whole lifetime.

chrome/common/chrome_paths_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/chrome_paths_internal.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/base_paths.h"
 #include "base/logging.h"
@@ skipping 46 matching lines @@
 }
 
 FilePath GetVersionedDirectory() {
   if (g_override_versioned_directory)
     return *g_override_versioned_directory;
 
   // Start out with the path to the running executable.
   FilePath path;
   PathService::Get(base::FILE_EXE, &path);
 
+  if (path.DirName().BaseName() != FilePath("MacOS")) {
+    // Raw test binary.

[Mark Mentovai, 2010/11/15 17:50:01]

Care to elaborate?

+    path = path.DirName().Append(
+        FilePath::FromWStringHack(kBrowserProcessExecutablePath));
+  }
+
   // One step up to MacOS, another to Contents.
   path = path.DirName().DirName();
   DCHECK_EQ(path.BaseName().value(), "Contents");
 
   if (mac_util::IsBackgroundOnlyProcess()) {
     // path identifies the helper .app's Contents directory in the browser
     // .app's versioned directory.  Go up two steps to get to the browser
     // .app's versioned directory.
     path = path.DirName().DirName();
     DCHECK_EQ(path.BaseName().value(), kChromeVersion);
@@ skipping 26 matching lines @@
   // The framework bundle is at a known path and name from the browser .app's
   // versioned directory.
   return GetVersionedDirectory().Append(kFrameworkName);
 }
 
 bool GetLocalLibraryDirectory(FilePath* result) {
   return mac_util::GetLocalDirectory(NSLibraryDirectory, result);
 }
 
 }  // namespace chrome