Use irt from within chrome install

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerGDB.cs

Index: visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerGDB.cs
diff --git a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerGDB.cs b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerGDB.cs
index f4cebfe179bd270e6cd4bec86e72f39459e4cbc8..d5a41b6c2a646754c23a214054bd9f3cd0689241 100644
--- a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerGDB.cs
+++ b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerGDB.cs
@@ -8,6 +8,7 @@ namespace NativeClientVSAddIn
   using System.IO;
   using System.Text;
   using System.Windows.Forms;
+  using System.Diagnostics;
 
   using EnvDTE;
   using EnvDTE80;
@@ -60,7 +61,17 @@ namespace NativeClientVSAddIn
     public PluginDebuggerGDB(DTE2 dte, PropertyManager properties)
         : base(dte, properties)
     {
-      irtPath_ = properties.IrtPath;
+      string arch = properties.TargetArchitecture;
+      string chrome_path = properties.LocalDebuggerCommand;
+      FileVersionInfo version_info = FileVersionInfo.GetVersionInfo(chrome_path);
+      string file_version = version_info.FileVersion;

[binji, 2012/09/17 17:52:06]

It seems GetVersionInfo can return a FileVersionInfo with null FileVersion; you
should probably check for it.

see
http://msdn.microsoft.com/en-us/library/system.diagnostics.fileversioninfo.ge...

[Sam Clegg, 2012/09/17 19:58:16]

Done.

+      irtPath_ = Path.Combine(Path.GetDirectoryName(chrome_path), file_version, "nacl_irt_" + arch + ".nexe");

[binji, 2012/09/17 17:52:06]

nit: wrap at 100 chars (for C#)

[Sam Clegg, 2012/09/17 19:58:16]

Done.

+      if (!File.Exists(irtPath_))
+      {
+        MessageBox.Show("NaCL IRT not found in chrome install.\nLooking for: " + irtPath_);
+        irtPath_ = null;
+      }
+
       manifestPath_ = properties.ManifestPath;
       pluginAssembly_ = properties.PluginAssembly;
       pluginProjectDirectory_ = properties.ProjectDirectory;
@@ -162,8 +173,14 @@ namespace NativeClientVSAddIn
         contents.AppendFormat("file \"{0}\"\n", pluginAssemblyEscaped);
       }
 
-      string irtPathEscaped = irtPath_.Replace("\\", "\\\\");
-      contents.AppendFormat("nacl-irt {0}\n", irtPathEscaped);
+      // irtPath_ could be null if the irt nexe was not found in the chrome
+      // install.
+      if (irtPath_ != null)
+      {
+        string irtPathEscaped = irtPath_.Replace("\\", "\\\\");
+        contents.AppendFormat("nacl-irt \"{0}\"\n", irtPathEscaped);

[binji, 2012/09/17 17:52:06]

what happens when this command isn't run? Is it useful to start the debugger at
all?

[Sam Clegg, 2012/09/17 19:58:16]

In this case yes, you only need to IRT if you want to have
symbols for the IRT itself.  Even if we can't find the IRT
we can still debug the application code.

However, there are fatal errors in this function and I
have not figured out how to abort the debugging session
from here.

+      }
+
       contents.AppendFormat("target remote localhost:{0}\n", 4014);
 
       // Insert breakpoints from Visual Studio project.