Ensure we pass on the --no-sandbox to the callstack browser tests when it's specified for TSAN.

content/test/content_browser_test_test.cc

 // Copyright (c) 2011 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.
 
 #include "content/public/test/content_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/process/launch.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 11 matching lines @@
 #include "content/shell/browser/shell.h"
 #include "content/shell/common/shell_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace content {
 
+// Disabled on official builds because symbolization in sandboxes processes
+// opens up security holes.
 // On Android symbolization happens in one step after all the tests ran, so this
 // test doesn't work there.
 // TODO(mac): figure out why symbolization doesn't happen in the renderer.
 // http://crbug.com/521456
 // TODO(win): send PDB files for component build. http://crbug.com/521459
-#if !defined(OS_ANDROID) && !defined(OS_MACOSX) && \
+#if !defined(OFFICIAL_BUILD) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && \
     !(defined(COMPONENT_BUILD) && defined(OS_WIN))
 
 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) {
   // Ensures that tests with MANUAL_ prefix don't run automatically.
   ASSERT_TRUE(false);
 }
 
 class CrashObserver : public RenderProcessHostObserver {
  public:
   CrashObserver(const base::Closure& quit_closure)
@@ skipping 30 matching lines @@
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::CommandLine new_test =
       base::CommandLine(base::CommandLine::ForCurrentProcess()->GetProgram());
   new_test.AppendSwitchASCII(base::kGTestFilterFlag,
                              "ContentBrowserTest.MANUAL_RendererCrash");
   new_test.AppendSwitch(kRunManualTestsFlag);
   new_test.AppendSwitch(kSingleProcessTestsFlag);
 
-#if defined(ADDRESS_SANITIZER)
   // Per https://www.chromium.org/developers/testing/addresssanitizer, there are
   // ASAN bots that run without the sandbox which this test will pass for. The
   // other ones pipe the output to a symbolizer script.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoSandbox)) {
     new_test.AppendSwitch(switches::kNoSandbox);
   } else {
+#if defined(ADDRESS_SANITIZER)
     LOG(INFO) << "Couldn't run ContentBrowserTest.RendererCrashCallStack since "
               << "sandbox is enabled and ASAN requires piping to an external "
               << "script.";
     return;
+#endif
   }
-#endif
 
   std::string output;
   base::GetAppOutputAndError(new_test, &output);
 
   std::string crash_string =
       "content::RenderFrameImpl::PrepareRenderViewForNavigation";
 
   if (output.find(crash_string) == std::string::npos) {
     GTEST_FAIL() << "Couldn't find\n" << crash_string << "\n in output\n "
                  << output;
@@ skipping 66 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, NonNestableTask) {
   bool non_nested_task_ran = false;
   base::ThreadTaskRunnerHandle::Get()->PostNonNestableTask(
       FROM_HERE, base::Bind(&CallbackChecker, &non_nested_task_ran));
   content::RunAllPendingInMessageLoop();
   ASSERT_TRUE(non_nested_task_ran);
 }
 
 }  // namespace content