Correct style issues in Linux sandbox code.

NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/10818015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152123 0039d316-1c4b-4281-b951-d872f2087c98

content/common/sandbox_linux.cc

@@ -39,11 +39,11 @@ void LogSandboxStarted(const std::string& sandbox_name) {
 bool IsSeccompLegacyDesired() {
 #if defined(SECCOMP_SANDBOX)
 #if defined(NDEBUG)
-  // Off by default; allow turning on with a switch.
+  // Off by default. Allow turning on with a switch.
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableSeccompSandbox);
 #else
-  // On by default; allow turning off with a switch.
+  // On by default. Allow turning off with a switch.
   return !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableSeccompSandbox);
 #endif  // NDEBUG

content/common/sandbox_linux.h

@@ -45,7 +45,7 @@ class LinuxSandbox {
   // process type (this is for instance the case with the Zygote).
   // In that case, it is crucial that PreinitializeSandboxFinish() gets
   // called for every child process.
-  // TODO(markus,jln) we know this is not always done at the moment
+  // TODO(markus, jln) we know this is not always done at the moment
   // (crbug.com/139877).
   void PreinitializeSandbox(const std::string& process_type);
   // These should be called together.

sandbox/linux/suid/client/setuid_sandbox_client.cc

@@ -28,8 +28,8 @@ void SetSandboxAPIEnvironmentVariable(base::Environment* env) {
 // Wrapper around a shared C function.
 // Returns the "saved" environment variable name corresponding to |envvar|
 // in a new string or NULL.
-std::string* CreateSavedVariableName(const char* envvar) {
-  char* const saved_env_var = SandboxSavedEnvironmentVariable(envvar);
+std::string* CreateSavedVariableName(const char* env_var) {
+  char* const saved_env_var = SandboxSavedEnvironmentVariable(env_var);
   if (!saved_env_var)
     return NULL;
   std::string* saved_env_var_copy = new std::string(saved_env_var);
@@ -44,7 +44,7 @@ std::string* CreateSavedVariableName(const char* envvar) {
 // renderer.
 void SaveSUIDUnsafeEnvironmentVariables(base::Environment* env) {
   for (unsigned i = 0; kSUIDUnsafeEnvironmentVariables[i]; ++i) {
-    const char* const env_var = kSUIDUnsafeEnvironmentVariables[i];
+    const char* env_var = kSUIDUnsafeEnvironmentVariables[i];
     // Get the saved environment variable corresponding to envvar.
     scoped_ptr<std::string> saved_env_var(CreateSavedVariableName(env_var));
     if (saved_env_var == NULL)
@@ -113,14 +113,14 @@ SetuidSandboxClient::~SetuidSandboxClient() {
 }
 
 bool SetuidSandboxClient::ChrootMe() {
-  int fd = GetIPCDescriptor(env_);
+  int ipc_fd = GetIPCDescriptor(env_);
 
-  if (fd < 0) {
+  if (ipc_fd < 0) {
     LOG(ERROR) << "Failed to obtain the sandbox IPC descriptor";
     return false;
   }
 
-  if (HANDLE_EINTR(write(fd, &kMsgChrootMe, 1)) != 1) {
+  if (HANDLE_EINTR(write(ipc_fd, &kMsgChrootMe, 1)) != 1) {
     PLOG(ERROR) << "Failed to write to chroot pipe";
     return false;
   }
@@ -134,7 +134,7 @@ bool SetuidSandboxClient::ChrootMe() {
   }
 
   char reply;
-  if (HANDLE_EINTR(read(fd, &reply, 1)) != 1) {
+  if (HANDLE_EINTR(read(ipc_fd, &reply, 1)) != 1) {
     PLOG(ERROR) << "Failed to read from chroot pipe";
     return false;
   }
@@ -176,3 +176,4 @@ void SetuidSandboxClient::SetupLaunchEnvironment() {
 }
 
 }  // namespace sandbox
+

sandbox/linux/suid/client/setuid_sandbox_client.h

@@ -56,3 +56,4 @@ class SetuidSandboxClient {
 }  // namespace sandbox
 
 #endif  // SANDBOX_LINUX_SUID_SETUID_SANDBOX_CLIENT_H_
+

sandbox/linux/suid/client/setuid_sandbox_client_unittest.cc

@@ -91,3 +91,4 @@ TEST(SetuidSandboxClient, SandboxedClientAPI) {
 }
 
 }  // namespace sandbox
+