Use irt from within chrome install

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerGDB.cs

 // 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.
 
 namespace NativeClientVSAddIn
 {
   using System;
   using System.IO;
   using System.Text;
   using System.Windows.Forms;
+  using System.Diagnostics;
 
   using EnvDTE;
   using EnvDTE80;
 
   /// <summary>
   /// This class handles the details of finding a nexe and attaching to it.
   /// </summary>
   public class PluginDebuggerGDB : PluginDebuggerBase
   {
     /// <summary>
@@ skipping 32 matching lines @@
     private string gdbInitFileName_;
 
     /// <summary>
     /// Constructs the PluginDebuggerHelper.
     /// </summary>
     /// <param name="dte">Automation object from Visual Studio.</param>
     /// <param name="properties">PropertyManager pointing to a valid project/platform.</param>
     public PluginDebuggerGDB(DTE2 dte, PropertyManager properties)
         : base(dte, properties)
     {
-      irtPath_ = properties.IrtPath;
+      string arch = "i686";
+      if (Environment.Is64BitOperatingSystem)
+      {
+        arch = "x86_64";
+      }
+
+      if (properties.TargetArchitecture != arch)
+      {
+        MessageBox.Show(string.Format("Debugging of {0} NaCl modules is not possible on this system ({1}).", 

[binji, 2012/09/17 21:54:06]

nit: wrap at 100

+                                      properties.TargetArchitecture, arch));
+      }
+
+      // check chrome version

[binji, 2012/09/17 21:54:06]

Not necessary for this CL, but these checks feel like they should be separate
functions.

+      string chrome_path = properties.LocalDebuggerCommand;
+      FileVersionInfo version_info = FileVersionInfo.GetVersionInfo(chrome_path);
+      string file_version = version_info.FileVersion;
+      if (file_version != null)
+      {
+        string major_version = file_version.Split('.')[0];
+        int major_version_int = 0;
+        try
+        {
+          major_version_int = Convert.ToInt32(major_version);
+        }
+        catch
+        {
+        }
+        if (major_version_int < 22)
+        {
+          MessageBox.Show("Chrome 22 or above required for NaCl debugging (your version is "
+                          + major_version + ")");
+          return;
+        }
+      }
+
+      // We look for the IRT in several ways, mimicing what chrome itself

[binji, 2012/09/17 21:54:06]

nit: mimicking

+      // does in chrome/app/client_util.cc:MakeMainDllLoader.
+
+      // First look for the IRT alongside chrome.exe
+      string irt_basename = "nacl_irt_" + arch + ".nexe";
+      irtPath_ = Path.Combine(Path.GetDirectoryName(chrome_path), irt_basename);
+      if (!File.Exists(irtPath_))
+      {
+        // Next look for a folder alongside chrome.exe with the same name
+        // as the version embedded in chrome.exe.
+        if (file_version == null)

[binji, 2012/09/17 21:54:06]

nit: the comment above makes it seem like this check should be reversed.

+        {
+          if (!File.Exists(irtPath_))

[binji, 2012/09/17 21:54:06]

pull this common code out

+          {
+            MessageBox.Show("NaCL IRT not found in chrome install.\nLooking for: " + irtPath_);
+            irtPath_ = null;
+          }
+        }
+        else
+        {
+          irtPath_ = Path.Combine(Path.GetDirectoryName(chrome_path), 
+                                  file_version, irt_basename);
+          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;
       gdbPath_ = Path.Combine(
           properties.SDKRootDirectory,
           "toolchain",
           string.Concat("win_x86_", properties.ToolchainName),
           @"bin\x86_64-nacl-gdb.exe");
 
       PluginFoundEvent += new EventHandler<PluginFoundEventArgs>(Attach);
@@ skipping 81 matching lines @@
       {
         string manifestEscaped = manifestPath_.Replace("\\", "\\\\");
         contents.AppendFormat("nacl-manifest {0}\n", manifestEscaped);
       }
       else
       {
         string pluginAssemblyEscaped = pluginAssembly_.Replace("\\", "\\\\");
         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);
+      }
+
       contents.AppendFormat("target remote localhost:{0}\n", 4014);
 
       // Insert breakpoints from Visual Studio project.
       if (Dte.Debugger.Breakpoints != null)
       {
         foreach (Breakpoint bp in Dte.Debugger.Breakpoints)
         {
           if (!bp.Enabled)
           {
             continue;
@@ skipping 30 matching lines @@
         gdbProcess_.Start();
       }
       catch (Exception e)
       {
         MessageBox.Show(
             string.Format("NaCl-GDB Start Failed. {0}. Path: {1}", e.Message, gdbPath_));
       }
     }
   }
 }