Fixing trybot failure

athena/test/chrome/athena_app_browsertest.cc

Index: athena/test/chrome/athena_app_browsertest.cc
diff --git a/athena/test/chrome/athena_app_browsertest.cc b/athena/test/chrome/athena_app_browsertest.cc
index 7c52e3b9bc7886ae156062e40a63242993acec4a..93ed1d9469df8d5291ecae9aeb33b80be78c6ab5 100644
--- a/athena/test/chrome/athena_app_browsertest.cc
+++ b/athena/test/chrome/athena_app_browsertest.cc
@@ -12,12 +12,22 @@
 
 namespace athena {
 
+namespace {
+const char kNoNaclSandbox[] = "--no-sandbox";

[oshima, 2014/10/25 05:10:31]

can you use kNoSandbox in content/public/common/content_switches.cc?

+}
+
 AthenaAppBrowserTest::AthenaAppBrowserTest() {
 }
 
 AthenaAppBrowserTest::~AthenaAppBrowserTest() {
 }
 
+void AthenaAppBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
+  // The NaCl sandbox won't work in our browser tests.
+  command_line->AppendSwitch(kNoNaclSandbox);
+  extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line);
+}
+
 Activity* AthenaAppBrowserTest::CreateTestAppActivity(
     const std::string app_id) {
   ActivityLifetimeTracker tracker;