Index: components/nacl/browser/nacl_file_host_unittest.cc |
diff --git a/components/nacl/browser/nacl_file_host_unittest.cc b/components/nacl/browser/nacl_file_host_unittest.cc |
index 204e35e2f387c4976cf5c70f88acd3ff75e0533b..ef7291130e8d1da543ae02f20c2253f6094f5930 100644 |
--- a/components/nacl/browser/nacl_file_host_unittest.cc |
+++ b/components/nacl/browser/nacl_file_host_unittest.cc |
@@ -7,6 +7,7 @@ |
#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" |
@@ -40,12 +41,12 @@ class NaClFileHostTest : public testing::Test { |
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() { |