Fix for BrowserThreadTest tests

content/browser/browser_thread_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 <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 11 matching lines @@
 class BrowserThreadTest : public testing::Test {
  public:
   void Release() const {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     loop_.task_runner()->PostTask(FROM_HERE,
                                   base::MessageLoop::QuitWhenIdleClosure());
   }
 
   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));
     file_thread_.reset(new BrowserThreadImpl(BrowserThread::FILE));
     ui_thread_->Start();
     file_thread_->Start();
   }
 
   void TearDown() override {
     StopUIThread();
@@ skipping 124 matching lines @@
   UIThreadDestructionObserver observer(&did_shutdown, loop.QuitClosure());
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&BrowserThreadTest::StopUIThread, base::Unretained(this)));
   loop.Run();
 
   EXPECT_TRUE(did_shutdown);
 }
 
 }  // namespace content