Add thread checks to NaClBrowser, and make it leaky

chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc

 // 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.
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/path_service.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/process/process.h"
@@ skipping 36 matching lines @@
   cmd.AppendArg(base::IntToString(debug_stub_port));
   cmd.AppendArg(test_name);
   LOG(INFO) << cmd.GetCommandLineString();
   *test_process = base::LaunchProcess(cmd, base::LaunchOptions());
 }
 
 void NaClGdbDebugStubTest::RunDebugStubTest(const std::string& nacl_module,
                                             const std::string& test_name) {
   base::Process test_script;
   std::unique_ptr<base::Environment> env(base::Environment::Create());
-  nacl::NaClBrowser::GetInstance()->SetGdbDebugStubPortListener(
-      base::Bind(&NaClGdbDebugStubTest::StartTestScript,
-                 base::Unretained(this), &test_script, test_name));
+  nacl::NaClBrowser::GetInstance()->SetGdbDebugStubPortListenerForTest(

[Wez, 2017/01/14 01:53:11]

bradnelson: These GetInstance() calls barf because we're on the main thread. We
could:

1. Update the test to PostTask them to the IO thread.
2. Make the GDB debug stub port listener APIs static, since they're just for
test, so their use on the wrong thread here is not really an issue.
3. Relax the thread check in GetInstance(). I'd prefer not to do that since new
regressions will just creep back in.

+      base::Bind(&NaClGdbDebugStubTest::StartTestScript, base::Unretained(this),
+                 &test_script, test_name));
   // Turn on debug stub logging.
   env->SetVar("NACLVERBOSITY", "1");
   RunTestViaHTTP(nacl_module);
   env->UnSetVar("NACLVERBOSITY");
-  nacl::NaClBrowser::GetInstance()->ClearGdbDebugStubPortListener();
+  nacl::NaClBrowser::GetInstance()->ClearGdbDebugStubPortListenerForTest();
   int exit_code;
   test_script.WaitForExit(&exit_code);
   EXPECT_EQ(0, exit_code);
 }
 
 // NaCl tests are disabled under ASAN because of qualification test.
 #if defined(ADDRESS_SANITIZER)
 # define MAYBE_Empty DISABLED_Empty
 #else
 # define MAYBE_Empty Empty
 #endif
 
 IN_PROC_BROWSER_TEST_F(NaClGdbDebugStubTest, MAYBE_Empty) {
   RunDebugStubTest("Empty", "continue");
 }
 
 #if defined(ADDRESS_SANITIZER)
 # define MAYBE_Breakpoint DISABLED_Breakpoint
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux: http://crbug.com/238469
 # define MAYBE_Breakpoint DISABLED_Breakpoint
 #else
 # define MAYBE_Breakpoint Breakpoint
 #endif
 
 IN_PROC_BROWSER_TEST_F(NaClGdbDebugStubTest, MAYBE_Breakpoint) {
   RunDebugStubTest("Empty", "breakpoint");
 }