Mac/clang: Possibly contentious changes.

chrome/common/sandbox_mac.mm

 // Copyright (c) 2009 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/sandbox_mac.h"
 
 #include "base/debug_util.h"
 
 #import <Cocoa/Cocoa.h>
 extern "C" {
@@ skipping 226 matching lines @@
   }
 
   { // Native Client access to /dev/random.
     GetUrandomFD();
   }
 }
 
 // Turns on the OS X sandbox for this process.
 bool EnableSandbox(SandboxProcessType sandbox_type,
                    const FilePath& allowed_dir) {
-  // Name of the file containing a common prefix included at the start of
-  // all the other sandbox profiles.
-  const NSString* kCommonSandboxPrefixFileName = @"common";
-
   // Sanity - currently only SANDBOX_TYPE_UTILITY supports a directory being
   // passed in.
   if (sandbox_type != SANDBOX_TYPE_UTILITY) {
     DCHECK(allowed_dir.empty())
         << "Only SANDBOX_TYPE_UTILITY allows a custom directory parameter.";
   }
   // We use a custom sandbox definition file to lock things down as
   // tightly as possible.
   // TODO(jeremy): Look at using include syntax to unify common parts of sandbox
   // definition files.
@@ skipping 29 matching lines @@
       // See http://code.google.com/p/nativeclient/issues/detail?id=344
       sandbox_config_filename = @"nacl_loader";
       break;
     default:
       NOTREACHED();
       return false;
   }
 
   // Read in the sandbox profile and the common prefix file.
   NSString* common_sandbox_prefix_path =
-      [mac_util::MainAppBundle() pathForResource:kCommonSandboxPrefixFileName
+      [mac_util::MainAppBundle() pathForResource:@"common"
                                           ofType:@"sb"];
   NSString* common_sandbox_prefix_data =
       [NSString stringWithContentsOfFile:common_sandbox_prefix_path
                                 encoding:NSUTF8StringEncoding
                                    error:NULL];
 
   if (!common_sandbox_prefix_data) {
     LOG(ERROR) << "Failed to find the sandbox profile on disk "
                 << [common_sandbox_prefix_path fileSystemRepresentation];
     return false;
@@ skipping 98 matching lines @@
   bool success = (error == 0 && error_buff == NULL);
   LOG_IF(ERROR, !success) << "Failed to initialize sandbox: "
                           << error
                           << " "
                           << error_buff;
   sandbox_free_error(error_buff);
   return success;
 }
 
 }  // namespace sandbox