9 files changed, 7 insertions, 17 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 9dff4b0..52a9334 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -61,6 +61,7 @@
 #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_WIN)
 #include "sandbox/src/sandbox.h"
 #include "tools/memory_watcher/memory_watcher.h"
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index b3b3756..fe9addf 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -42,6 +42,7 @@
 #include "chrome/common/render_messages.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_descriptors.h"
+#include "ipc/ipc_switches.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 07f202a..9c6930a 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -57,6 +57,7 @@
 #include "chrome/renderer/render_thread.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "grit/generated_resources.h"
+#include "ipc/ipc_switches.h"
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc
index d919b4c..149d296 100644
--- a/chrome/browser/utility_process_host.cc
+++ b/chrome/browser/utility_process_host.cc
@@ -13,6 +13,7 @@
 #include "base/task.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
+#include "ipc/ipc_switches.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/sandbox_policy.h"
diff --git a/chrome/browser/worker_host/worker_process_host.cc b/chrome/browser/worker_host/worker_process_host.cc
index c8ce3b1..bcb3da2 100644
--- a/chrome/browser/worker_host/worker_process_host.cc
+++ b/chrome/browser/worker_host/worker_process_host.cc
@@ -25,6 +25,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/worker_messages.h"
 #include "ipc/ipc_descriptors.h"
+#include "ipc/ipc_switches.h"
 #include "net/base/registry_controlled_domain.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc
index e2f7c5f..9168570 100644
--- a/chrome/common/child_thread.cc
+++ b/chrome/common/child_thread.cc
@@ -11,6 +11,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/plugin_messages.h"
 #include "ipc/ipc_logging.h"
+#include "ipc/ipc_switches.h"
 #include "webkit/glue/webkit_glue.h"
 
 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 85b08a1..1ad949d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -47,10 +47,6 @@ const wchar_t kPluginStartupDialog[]           = L"plugin-startup-dialog";
 //   --plugin-launcher="path\to\purify /Run=yes"
 const wchar_t kPluginLauncher[]                = L"plugin-launcher";
 
-// The value of this switch tells the child process which
-// IPC channel the browser expects to use to communicate with it.
-const wchar_t kProcessChannelID[]              = L"channel";
-
 // The value of this switch tells the app to listen for and broadcast
 // testing-related messages on IPC channel with the given ID.
 const wchar_t kTestingChannelID[]              = L"testing-channel";
@@ -160,11 +156,6 @@ const wchar_t kJavaScriptFlags[]               = L"js-flags";
 // string value, the 2 letter code from ISO 3166-1.
 const wchar_t kCountry[]                       = L"country";
 
-// Will add kDebugOnStart to every child processes. If a value is passed, it
-// will be used as a filter to determine if the child process should have the
-// kDebugOnStart flag passed on or not.
-const wchar_t kDebugChildren[]                 = L"debug-children";
-
 // Will add kWaitForDebugger to every child processes. If a value is passed, it
 // will be used as a filter to determine if the child process should have the
 // kWaitForDebugger flag passed on or not.
@@ -440,10 +431,6 @@ const wchar_t kUtilityCmdPrefix[]             = L"utility-cmd-prefix";
 // Temparary option for new ftp implemetation.
 const wchar_t kNewFtp[]                        = L"new-ftp";
 
-// On POSIX only: use FIFO for IPC channels so that "unrelated" process
-// can connect to a channel, provided it knows its name. For debugging purposes.
-const wchar_t kIPCUseFIFO[]                    = L"ipc-use-fifo";
-
 // Enable Native Web Worker support
 const wchar_t kEnableNativeWebWorkers[]        = L"enable-native-web-workers";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 0727da2..6ae95bf 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -22,7 +22,6 @@ extern const wchar_t kRendererStartupDialog[];
 extern const wchar_t kPluginStartupDialog[];
 extern const wchar_t kPluginLauncher[];
 
-extern const wchar_t kProcessChannelID[];
 extern const wchar_t kTestingChannelID[];
 extern const wchar_t kHomePage[];
 extern const wchar_t kRendererProcess[];
@@ -53,7 +52,6 @@ extern const wchar_t kPluginPath[];
 extern const wchar_t kUserAgent[];
 extern const wchar_t kJavaScriptFlags[];
 extern const wchar_t kCountry[];
-extern const wchar_t kDebugChildren[];
 extern const wchar_t kWaitForDebuggerChildren[];
 
 extern const wchar_t kLogFilterPrefix[];
@@ -163,8 +161,6 @@ extern const wchar_t kUtilityCmdPrefix[];
 
 extern const wchar_t kNewFtp[];
 
-extern const wchar_t kIPCUseFIFO[];
-
 extern const wchar_t kEnableNativeWebWorkers[];
 extern const wchar_t kWebWorkerProcessPerCore[];
 extern const wchar_t kWebWorkerShareProcesses[];
diff --git a/chrome/common/debug_flags.cc b/chrome/common/debug_flags.cc
index 97c2725..5e0b43e 100644
--- a/chrome/common/debug_flags.cc
+++ b/chrome/common/debug_flags.cc
@@ -7,6 +7,7 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
+#include "ipc/ipc_switches.h"
 
 bool DebugFlags::ProcessDebugFlags(CommandLine* command_line,
                                    ChildProcessInfo::ProcessType type,