Fix for BrowserThreadTest tests

content/browser/browser_thread_unittest.cc

Index: content/browser/browser_thread_unittest.cc
diff --git a/content/browser/browser_thread_unittest.cc b/content/browser/browser_thread_unittest.cc
index 71cd598236d48faa34b99602ace654d57e3b0eb8..7ed1500adf4d41a123c02ee3878fbf9638210ea4 100644
--- a/content/browser/browser_thread_unittest.cc
+++ b/content/browser/browser_thread_unittest.cc
@@ -29,6 +29,13 @@ class BrowserThreadTest : public testing::Test {
 
   void StopUIThread() { ui_thread_->Stop(); }
 
+  ~BrowserThreadTest() override {
+    ui_thread_ = nullptr;

[jam, 2017/03/02 01:07:04]

nit: put it in Teardown to match Setup, i.e. move this to line 48

+    file_thread_ = nullptr;
+    BrowserThreadImpl::ResetGlobalsForTesting(BrowserThread::UI);
+    BrowserThreadImpl::ResetGlobalsForTesting(BrowserThread::FILE);
+  }
+
  protected:
   void SetUp() override {
     ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI));