Index: chrome/test/nacl/nacl_browsertest.cc |
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc |
index 2df28a7044d1a099809f9fc112b153ba851a8d1f..e33e9dfa722682ced5a81b8d950c738d8601ea4d 100644 |
--- a/chrome/test/nacl/nacl_browsertest.cc |
+++ b/chrome/test/nacl/nacl_browsertest.cc |
@@ -16,6 +16,8 @@ |
#include "base/path_service.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/test/nacl/nacl_browsertest_util.h" |
+#include "components/nacl/common/nacl_switches.h" |
+#include "content/public/common/content_switches.h" |
namespace { |
@@ -187,6 +189,28 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, RelativeManifest) { |
RunLoadTest(FILE_PATH_LITERAL("manifest/relative_manifest.html")); |
} |
+class NaClBrowserTestPnaclDebugURL : public NaClBrowserTestPnacl { |
+ public: |
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ NaClBrowserTestPnacl::SetUpCommandLine(command_line); |
+ // Turn on debugging to influence the PNaCl URL loaded |
bradn
2014/02/27 00:14:42
Can we do a test with debug on and off?
jvoung (off chromium)
2014/02/27 23:06:37
Done.
|
+ command_line->AppendSwitch(switches::kEnableNaClDebug); |
+ // On windows, the debug stub requires --no-sandbox: |
+ // crbug.com/265624 |
+#if defined(OS_WIN) |
+ command_line->AppendSwitch(switches::kNoSandbox); |
+#endif |
+ // Don't actually debug the app though. |
+ command_line->AppendSwitchASCII(switches::kNaClDebugMask, |
+ "!<all_urls>"); |
+ } |
+}; |
+ |
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDebugURL, |
+ MAYBE_PNACL(PnaclDebugURL)) { |
+ RunLoadTest(FILE_PATH_LITERAL("pnacl_debug_url.html")); |
+} |
+ |
IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
MAYBE_PNACL(PnaclErrorHandling)) { |
RunNaClIntegrationTest(FILE_PATH_LITERAL("pnacl_error_handling.html")); |