Add debug switches for NaCl to chrome. These switches will propogate through the broker all the way to the NaCl sel loader.

The switches enable debugging of the NEXE, and allow port/IP configuration.  Changes to NaCl will be in the NaCl repository.

BUG=http://code.google.com/p/nativeclient/issues/detail?id=728
TEST=none

NOTE:  Try server for linux only failed however run of -b linux at a later time passed.  However, presubmit is still showing a
linux failure warning.

Review URL: http://codereview.chromium.org/3184023

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

3 files changed, 15 insertions, 0 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index c232c8d..b2c3073 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -439,6 +439,9 @@ const char kEnableMonitorProfile[]          = "enable-monitor-profile";
 // (internally adds kInternalNaCl and lEnableGpuPlugin to the command line).
 const char kEnableNaCl[]                    = "enable-nacl";
 
+// Enables debugging via RSP over a socket.
+const char kEnableNaClDebug[]               = "enable-nacl-debug";
+
 // Enable Native Web Worker support.
 const char kEnableNativeWebWorkers[]        = "enable-native-web-workers";
 
@@ -712,6 +715,12 @@ const char kMessageLoopHistogrammer[]       = "message-loop-histogrammer";
 // and performance tests.
 const char kMetricsRecordingOnly[]          = "metrics-recording-only";
 
+// Sets the default IP address (interface) for the stub (normally 127.0.0.1).
+const char kNaClDebugIP[]                   = "nacl-debug-ip";
+
+// Sets the default port range for debugging.
+const char kNaClDebugPorts[]                = "nacl-debug-ports";
+
 // Causes the process to run as a NativeClient broker
 // (used for launching NaCl loader processes on 64-bit Windows).
 const char kNaClBrokerProcess[]             = "nacl-broker";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1c9f8ef..1cb299f 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -136,6 +136,7 @@ extern const char kEnableMatchPreview[];
 extern const char kEnableMemoryInfo[];
 extern const char kEnableMonitorProfile[];
 extern const char kEnableNaCl[];
+extern const char kEnableNaClDebug[];
 extern const char kEnableNativeWebWorkers[];
 extern const char kEnableNewPageInfoBubble[];
 extern const char kEnablePreconnect[];
@@ -210,6 +211,8 @@ extern const char kMediaCacheSize[];
 extern const char kMemoryProfiling[];
 extern const char kMessageLoopHistogrammer[];
 extern const char kMetricsRecordingOnly[];
+extern const char kNaClDebugIP[];
+extern const char kNaClDebugPorts[];
 extern const char kNaClBrokerProcess[];
 extern const char kNaClLoaderProcess[];
 extern const char kNaClStartupDialog[];
diff --git a/chrome/common/nacl_cmd_line.cc b/chrome/common/nacl_cmd_line.cc
index c2a3b8c..4c2f19f 100644
--- a/chrome/common/nacl_cmd_line.cc
+++ b/chrome/common/nacl_cmd_line.cc
@@ -28,6 +28,9 @@ void CopyNaClCommandLineArguments(CommandLine* cmd_line) {
     switches::kEnableDCHECK,
     switches::kSilentDumpOnDCHECK,
     switches::kMemoryProfiling,
+    switches::kEnableNaClDebug,
+    switches::kNaClDebugPorts,
+    switches::kNaClDebugIP,
   };
   cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
                              arraysize(kSwitchNames));