content: Move shader cache factory singleton into a separate file.

content/browser/gpu/shader_disk_cache_unittest.cc

Index: content/browser/gpu/shader_disk_cache_unittest.cc
diff --git a/content/browser/gpu/shader_disk_cache_unittest.cc b/content/browser/gpu/shader_disk_cache_unittest.cc
index 80629470a316ac7be24d394e26270b2228b82d33..ee6592fd318845823927928d21336583d1f9fa45 100644
--- a/content/browser/gpu/shader_disk_cache_unittest.cc
+++ b/content/browser/gpu/shader_disk_cache_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/browser_thread_impl.h"
@@ -25,8 +26,7 @@ class ShaderDiskCacheTest : public testing::Test {
  public:
   ShaderDiskCacheTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
-    ShaderCacheFactory::InitInstance(
-        base::ThreadTaskRunnerHandle::Get(),
+    factory_ = base::MakeUnique<ShaderCacheFactory>(
         BrowserThread::GetTaskRunnerForThread(BrowserThread::CACHE));
   }
 
@@ -36,15 +36,15 @@ class ShaderDiskCacheTest : public testing::Test {
 
   void InitCache() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    ShaderCacheFactory::GetInstance()->SetCacheInfo(kDefaultClientId,
-                                                        cache_path());
+    factory_->SetCacheInfo(kDefaultClientId, cache_path());
   }
 
+  ShaderCacheFactory* factory() { return factory_.get(); }
+
  private:
-  void TearDown() override {
-    ShaderCacheFactory::GetInstance()->RemoveCacheInfo(kDefaultClientId);
-  }
+  void TearDown() override { factory_->RemoveCacheInfo(kDefaultClientId); }
 
+  std::unique_ptr<ShaderCacheFactory> factory_;
   base::ScopedTempDir temp_dir_;
   content::TestBrowserThreadBundle thread_bundle_;
 
@@ -54,8 +54,7 @@ class ShaderDiskCacheTest : public testing::Test {
 TEST_F(ShaderDiskCacheTest, ClearsCache) {
   InitCache();
 
-  scoped_refptr<ShaderDiskCache> cache =
-      ShaderCacheFactory::GetInstance()->Get(kDefaultClientId);
+  scoped_refptr<ShaderDiskCache> cache = factory()->Get(kDefaultClientId);
   ASSERT_TRUE(cache.get() != NULL);
 
   net::TestCompletionCallback available_cb;