Cleanup: Add a const variable for /proc/self/exe.

base/base_paths_posix.cc

 // Copyright (c) 2012 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 "base/base_paths.h"
 
 #include <ostream>
 #include <string>
 
 #include "build/build_config.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/nix/xdg_util.h"
 
 #if defined(OS_FREEBSD)
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #elif defined(OS_SOLARIS)
 #include <stdlib.h>
 #endif
 
+#if defined(OS_LINUX)
+#include "base/process_util.h"

[brettw, 2012/09/14 21:56:52]

I'd put this above and not in an ifdef.

[Lei Zhang, 2012/09/14 22:00:54]

Done.

+#endif
+
 namespace base {
 
-#if defined(OS_LINUX)
-const char kSelfExe[] = "/proc/self/exe";
-#endif
-
 bool PathProviderPosix(int key, FilePath* result) {
   FilePath path;
   switch (key) {
     case base::FILE_EXE:
     case base::FILE_MODULE: {  // TODO(evanm): is this correct?
 #if defined(OS_LINUX)
       FilePath bin_dir;
-      if (!file_util::ReadSymbolicLink(FilePath(kSelfExe), &bin_dir)) {
-        NOTREACHED() << "Unable to resolve " << kSelfExe << ".";
+      if (!file_util::ReadSymbolicLink(FilePath(kProcSelfExe), &bin_dir)) {
+        NOTREACHED() << "Unable to resolve " << kProcSelfExe << ".";
         return false;
       }
       *result = bin_dir;
       return true;
 #elif defined(OS_FREEBSD)
       int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
       char bin_dir[PATH_MAX + 1];
       size_t length = sizeof(bin_dir);
       // Upon return, |length| is the number of bytes written to |bin_dir|
       // including the string terminator.
       int error = sysctl(name, 4, bin_dir, &length, NULL, 0);
       if (error < 0 || length <= 1) {
         NOTREACHED() << "Unable to resolve path.";
         return false;
       }
       *result = FilePath(FilePath::StringType(bin_dir, length - 1));
       return true;
 #elif defined(OS_SOLARIS)
       char bin_dir[PATH_MAX + 1];
       if (realpath(getexecname(), bin_dir) == NULL) {
         NOTREACHED() << "Unable to resolve " << getexecname() << ".";
         return false;
       }
       *result = FilePath(bin_dir);
       return true;
 #elif defined(OS_OPENBSD)
       // There is currently no way to get the executable path on OpenBSD
-      char *cpath;
+      char* cpath;
       if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
         *result = FilePath(cpath);
       else
         *result = FilePath("/usr/local/chrome/chrome");
       return true;
 #endif
     }
     case base::DIR_SOURCE_ROOT: {
       // Allow passing this in the environment, for more flexibility in build
       // tree configurations (sub-project builds, gyp --output_dir, etc.)
@@ skipping 29 matching lines @@
     }
     case base::DIR_HOME: {
       *result = file_util::GetHomeDir();
       return true;
     }
   }
   return false;
 }
 
 }  // namespace base