Move the Linux zygote stuff into its own per-process directory.

chrome/browser/ui/webui/about_ui.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 "chrome/browser/ui/webui/about_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 52 matching lines @@
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/webplugininfo.h"
 
+#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#include "content/public/common/sandbox_linux.h"
+#include "content/public/browser/zygote_host_linux.h"
+#endif
+
 #if defined(OS_WIN)
 #include "chrome/browser/enumerate_modules_model_win.h"
-#elif defined(OS_CHROMEOS)
+#endif
+
+#if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/oom_priority_manager.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "content/public/browser/zygote_host_linux.h"
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-#include "content/public/browser/zygote_host_linux.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/wm/frame_painter.h"
 #include "base/string_split.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
@@ skipping 943 matching lines @@
   AppendBody(&data);
   data.append("<h1>");
   data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
   data.append("</h1>");
 
   const int status = content::ZygoteHost::GetInstance()->GetSandboxStatus();
 
   data.append("<table>");
 
   AboutSandboxRow(&data, "", IDS_ABOUT_SANDBOX_SUID_SANDBOX,
-                  status & content::ZygoteHost::kSandboxSUID);
+                  status & content::kSandboxLinuxSUID);
   AboutSandboxRow(&data, "&nbsp;&nbsp;", IDS_ABOUT_SANDBOX_PID_NAMESPACES,
-                  status & content::ZygoteHost::kSandboxPIDNS);
+                  status & content::kSandboxLinuxPIDNS);
   AboutSandboxRow(&data, "&nbsp;&nbsp;", IDS_ABOUT_SANDBOX_NET_NAMESPACES,
-                  status & content::ZygoteHost::kSandboxNetNS);
+                  status & content::kSandboxLinuxNetNS);
   AboutSandboxRow(&data, "", IDS_ABOUT_SANDBOX_SECCOMP_SANDBOX,
-                  status & content::ZygoteHost::kSandboxSeccomp);
+                  status & content::kSandboxLinuxSeccomp);
 
   data.append("</table>");
 
-  bool good = ((status & content::ZygoteHost::kSandboxSUID) &&
-               (status & content::ZygoteHost::kSandboxPIDNS)) ||
-              (status & content::ZygoteHost::kSandboxSeccomp);
+  bool good = ((status & content::kSandboxLinuxSUID) &&
+               (status & content::kSandboxLinuxPIDNS)) ||
+              (status & content::kSandboxLinuxSeccomp);
   if (good) {
     data.append("<p style=\"color: green\">");
     data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_OK));
   } else {
     data.append("<p style=\"color: red\">");
     data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD));
   }
   data.append("</p>");
 
   AppendFooter(&data);
@@ skipping 388 matching lines @@
 
 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
     : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::DataSource* source =
       new AboutUIHTMLSource(name, profile);
   if (source) {
     ChromeURLDataManager::AddDataSource(profile, source);
   }
 }