Use a raw pointer instead of Singleton for PnaclHost and leak it.

components/nacl/browser/pnacl_host_unittest.cc

 // Copyright 2013 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/pnacl_host.h"
 
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <string>
@@ skipping 23 matching lines @@
 }  // namespace
 
 class PnaclHostTest : public testing::Test {
  protected:
   PnaclHostTest()
       : host_(NULL),
         temp_callback_count_(0),
         write_callback_count_(0),
         thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
   void SetUp() override {
-    host_ = new PnaclHost();
+    host_ = PnaclHost::GetInstance();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     host_->InitForTest(temp_dir_.path(), true);
     base::RunLoop().RunUntilIdle();
     EXPECT_EQ(PnaclHost::CacheReady, host_->cache_state_);
   }
   void TearDown() override {
     EXPECT_EQ(0U, host_->pending_translations());
     // Give the host a chance to de-init the backend, and then delete it.
     host_->RendererClosing(0);
     content::RunAllBlockingPoolTasksUntilIdle();
     EXPECT_EQ(PnaclHost::CacheUninitialized, host_->cache_state_);
-    delete host_;
   }
   int GetCacheSize() { return host_->disk_cache_->Size(); }
   int CacheIsInitialized() {
     return host_->cache_state_ == PnaclHost::CacheReady;
   }
   void ReInitBackend() {
     host_->InitForTest(temp_dir_.path(), true);
     base::RunLoop().RunUntilIdle();
     EXPECT_EQ(PnaclHost::CacheReady, host_->cache_state_);
   }
@@ skipping 367 matching lines @@
   EXPECT_EQ(0, GetCacheSize());
   EXPECT_EQ(0, cb.GetResult(net::ERR_IO_PENDING));
   // Now check that the backend has been freed.
   EXPECT_FALSE(CacheIsInitialized());
 }
 
 // A version of PnaclHostTest that initializes cache on disk.
 class PnaclHostTestDisk : public PnaclHostTest {
  protected:
   void SetUp() override {
-    host_ = new PnaclHost();
+    host_ = PnaclHost::GetInstance();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     host_->InitForTest(temp_dir_.path(), false);
     EXPECT_EQ(PnaclHost::CacheInitializing, host_->cache_state_);
   }
   void DeInit() {
     host_->DeInitIfSafe();
   }
 };
 TEST_F(PnaclHostTestDisk, DeInitWhileInitializing) {
   // Since there's no easy way to pump message queues one message at a time, we
   // have to simulate what would happen if 1 DeInitIfsafe task gets queued, then
   // a GetNexeFd gets queued, and then another DeInitIfSafe gets queued before
   // the first one runs. We can just shortcut and call DeInitIfSafe while the
   // cache is still initializing.
   DeInit();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace pnacl