Revert 30938 - Add support for getting the real process id from within the su...

chrome/app/chrome_dll_main.cc

 // 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.
 
 // TODO(port): the ifdefs in here are a first step towards trying to determine
 // the correct abstraction for all the OS functionality required at this
 // stage of process initialization. It should not be taken as a final
 // abstraction.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <algorithm>
 #include <atlbase.h>
 #include <atlapp.h>
 #include <malloc.h>
 #include <new.h>
 #elif defined(OS_POSIX)
 #include <locale.h>
 #include <signal.h>
+#include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #endif
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <stdlib.h>
 #include <string.h>
 #endif
 
 #include "app/app_paths.h"
 #include "app/resource_bundle.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "base/i18n/icu_util.h"
 #include "base/message_loop.h"
@@ skipping 11 matching lines @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/sandbox_init_wrapper.h"
 #include "ipc/ipc_switches.h"
 
 #if defined(OS_LINUX)
 #include "base/nss_init.h"
 #include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
-#include "chrome/browser/zygote_host_linux.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/app/breakpad_mac.h"
 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #endif
 
 #if defined(OS_POSIX)
@@ skipping 307 matching lines @@
   base::ProcessId browser_pid;
   if (process_type.empty()) {
     browser_pid = base::GetCurrentProcId();
   } else {
 #if defined(OS_WIN)
     std::wstring channel_name =
       parsed_command_line.GetSwitchValue(switches::kProcessChannelID);
 
     browser_pid =
         static_cast<base::ProcessId>(StringToInt(WideToASCII(channel_name)));
-    DCHECK_NE(browser_pid, 0);
+    DCHECK(browser_pid != 0);
 #else
     browser_pid = base::GetCurrentProcId();
 #endif
 
 #if defined(OS_POSIX)
     // When you hit Ctrl-C in a terminal running the browser
     // process, a SIGINT is delivered to the entire process group.
     // When debugging the browser process via gdb, gdb catches the
     // SIGINT for the browser process (and dumps you back to the gdb
     // console) but doesn't for the child processes, killing them.
@@ skipping 173 matching lines @@
                                      &autorelease_pool);
       rv = RendererMain(main_params);
     } else {
       rv = 0;
     }
 #else
     NOTIMPLEMENTED();
 #endif
   } else if (process_type.empty()) {
 #if defined(OS_LINUX)
-    const char* sandbox_binary = NULL;
-    struct stat st;
-
-    // In Chromium branded builds, developers can set an environment variable to
-    // use the development sandbox. See
-    // http://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment
-    if (stat("/proc/self/exe", &st) == 0 && st.st_uid == getuid())
-      sandbox_binary = getenv("CHROME_DEVEL_SANDBOX");
-
-#if defined(LINUX_SANDBOX_PATH)
-    if (!sandbox_binary)
-      sandbox_binary = LINUX_SANDBOX_PATH;
-#endif
-
-    std::string sandbox_cmd;
-    if (sandbox_binary)
-      sandbox_cmd = sandbox_binary;
-
-    // Tickle the sandbox host and zygote host so they fork now.
-    RenderSandboxHostLinux* shost = Singleton<RenderSandboxHostLinux>().get();
-    shost->Init(sandbox_cmd);
-    ZygoteHost* zhost = Singleton<ZygoteHost>().get();
-    zhost->Init(sandbox_cmd);
+    // Tickle the sandbox host so it forks now.
+    Singleton<RenderSandboxHostLinux>().get();
 
     // We want to be sure to init NSPR on the main thread.
     base::EnsureNSPRInit();
 
     g_thread_init(NULL);
     // Glib type system initialization. Needed at least for gconf,
     // used in net/proxy/proxy_config_service_linux.cc. Most likely
     // this is superfluous as gtk_init() ought to do this. It's
     // definitely harmless, so retained as a reminder of this
     // requirement for gconf.
     g_type_init();
     // gtk_init() can change |argc| and |argv|.
     gtk_init(&argc, &argv);
     SetUpGLibLogHandler();
-#endif  // defined(OS_LINUX)
+#endif
 
     ScopedOleInitializer ole_initializer;
     rv = BrowserMain(main_params);
   } else {
     NOTREACHED() << "Unknown process type";
   }
 
   if (!process_type.empty()) {
     ResourceBundle::CleanupSharedInstance();
   }
 
 #if defined(OS_WIN)
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 #endif
 
   logging::CleanupChromeLogging();
 
 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
   // TODO(mark): See the TODO(mark) above at InitCrashReporter.
   DestructCrashReporter();
 #endif  // OS_MACOSX && GOOGLE_CHROME_BUILD
 
   return rv;
 }