Enable --nacl-gdb flag on Linux.

chrome/browser/nacl_host/nacl_process_host.h

 // 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.
 
 #ifndef CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
 #define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #include "base/file_path.h"
 #include "base/file_util_proxy.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/message_loop.h"
 #include "base/process.h"
 #include "chrome/common/nacl_types.h"
 #include "content/public/browser/browser_child_process_host_delegate.h"
 
 class ChromeRenderMessageFilter;
 class CommandLine;
 class ExtensionInfoMap;
 
 namespace content {
 class BrowserChildProcessHost;
@@ skipping 29 matching lines @@
 
   bool Send(IPC::Message* msg);
 
  private:
   // Internal class that holds the nacl::Handle objecs so that
   // nacl_process_host.h doesn't include NaCl headers.  Needed since it's
   // included by src\content, which can't depend on the NaCl gyp file because it
   // depends on chrome.gyp (circular dependency).
   struct NaClInternal;
 
+#if defined(OS_WIN)
   // Create command line for launching loader under nacl-gdb.
   scoped_ptr<CommandLine> LaunchWithNaClGdb(const FilePath& nacl_gdb,
-                                            CommandLine* line,
-                                            const FilePath& manifest_path);
+                                            CommandLine* line);
+#endif
+#if defined(OS_LINUX)

[Mark Seaborn, 2012/04/03 21:57:44]

Use #elif, since this is the Linux version of the previous #if block.

[halyavin, 2012/04/04 09:23:15]

Done.

+  bool LaunchNaClGdb(base::ProcessId pid);
+  void OnNaClGdbAttached();
+#endif
+  // Get path to manifest on local disk if possible.
+  FilePath GetManifestPath();
   bool LaunchSelLdr();
 
   // BrowserChildProcessHostDelegate implementation:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnProcessCrashed(int exit_code) OVERRIDE;
   virtual void OnProcessLaunched() OVERRIDE;
 
   void IrtReady();
   void SendStart();
 
   // Message handlers for validation caching.
   void OnQueryKnownToValidate(const std::string& signature, bool* result);
   void OnSetKnownToValidate(const std::string& signature);
 
 #if defined(OS_WIN)
   class DebugContext;
 
   scoped_refptr<DebugContext> debug_context_;
 
   // This field becomes true when the broker successfully launched
   // the NaCl loader.
   bool process_launched_by_broker_;
 #endif
+#if defined(OS_LINUX)

[Mark Seaborn, 2012/04/03 21:57:44]

It'd be neater to use #elif here too.

[halyavin, 2012/04/04 09:23:15]

Done.

+  bool wait_for_nacl_gdb_;
+  MessageLoopForIO::FileDescriptorWatcher nacl_gdb_watcher_;
+  scoped_ptr<MessageLoopForIO::Watcher> nacl_gdb_watcher_delegate_;
+#endif
   // The ChromeRenderMessageFilter that requested this NaCl process.  We use
   // this for sending the reply once the process has started.
   scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter_;
 
   // The reply message to send. We must always send this message when the
   // sub-process either succeeds or fails to unblock the renderer waiting for
   // the reply. NULL when there is no reply to send.
   IPC::Message* reply_msg_;
 
   // Set of extensions for (NaCl) manifest auto-detection. The file path to
   // manifest is passed to nacl-gdb when it is used to debug the NaCl loader.
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 
   // Socket pairs for the NaCl process and renderer.
   scoped_ptr<NaClInternal> internal_;
 
   base::WeakPtrFactory<NaClProcessHost> weak_factory_;
 
   scoped_ptr<content::BrowserChildProcessHost> process_;
 
   bool enable_exception_handling_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
 };
 
 #endif  // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_