Add thread checks to NaClBrowser, and make it leaky

components/nacl/browser/nacl_file_host_unittest.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 "components/nacl/browser/nacl_file_host.h"
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/test/scoped_path_override.h"
 #include "build/build_config.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/browser/nacl_browser_delegate.h"
 #include "components/nacl/browser/test_nacl_browser_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using nacl_file_host::PnaclCanOpenFile;
 
 class FileHostTestNaClBrowserDelegate : public TestNaClBrowserDelegate {
@@ skipping 13 matching lines @@
   base::FilePath pnacl_path_;
 };
 
 class NaClFileHostTest : public testing::Test {
  protected:
   NaClFileHostTest();
   ~NaClFileHostTest() override;
 
   void SetUp() override {
     nacl_browser_delegate_ = new FileHostTestNaClBrowserDelegate;
-    nacl::NaClBrowser::SetDelegate(nacl_browser_delegate_);
+    nacl::NaClBrowser::SetDelegate(base::WrapUnique(nacl_browser_delegate_));
   }
 
   void TearDown() override {
-    // This deletes nacl_browser_delegate_.
-    nacl::NaClBrowser::SetDelegate(NULL);
+    nacl_browser_delegate_ = nullptr;
+    nacl::NaClBrowser::ClearAndDeleteDelegateForTest();
   }
 
   FileHostTestNaClBrowserDelegate* nacl_browser_delegate() {
     return nacl_browser_delegate_;
   }
 
  private:
   FileHostTestNaClBrowserDelegate* nacl_browser_delegate_;
   DISALLOW_COPY_AND_ASSIGN(NaClFileHostTest);
 };
@@ skipping 52 matching lines @@
   EXPECT_FALSE(PnaclCanOpenFile("..\\llc", &out_path));
   EXPECT_FALSE(PnaclCanOpenFile("%SystemRoot%", &out_path));
   EXPECT_FALSE(PnaclCanOpenFile("%SystemRoot%\\explorer.exe", &out_path));
 #else
   EXPECT_FALSE(PnaclCanOpenFile("../llc", &out_path));
   EXPECT_FALSE(PnaclCanOpenFile("/bin/sh", &out_path));
   EXPECT_FALSE(PnaclCanOpenFile("$HOME", &out_path));
   EXPECT_FALSE(PnaclCanOpenFile("$HOME/.bashrc", &out_path));
 #endif
 }