Fixing flaky ExtensionBrowsingDataTest.BrowsingDataRemovalMask test.

content/browser/gpu/shader_disk_cache.cc

 // Copyright (c) 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 "content/browser/gpu/shader_disk_cache.h"
 
 #include "base/threading/thread_checker.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/common/constants.h"
@@ skipping 85 matching lines @@
   base::WeakPtr<ShaderDiskCache> cache_;
   OpType op_type_;
   void* iter_;
   scoped_refptr<net::IOBufferWithSize> buf_;
   int host_id_;
   disk_cache::Entry* entry_;
 
   DISALLOW_COPY_AND_ASSIGN(ShaderDiskReadHelper);
 };
 
-class ShaderClearHelper : public base::RefCounted<ShaderClearHelper> {
+class ShaderClearHelper
+    : public base::RefCounted<ShaderClearHelper>,
+      public base::SupportsWeakPtr<ShaderClearHelper> {
  public:
   ShaderClearHelper(scoped_refptr<ShaderDiskCache> cache,
                     const base::FilePath& path,
                     const base::Time& delete_begin,
                     const base::Time& delete_end,
                     const base::Closure& callback);
   void Clear();
 
  private:
   friend class base::RefCounted<ShaderClearHelper>;
@@ skipping 258 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Hold a ref to ourselves so when we do the CacheCleared call we don't get
   // auto-deleted when our ref count drops to zero.
   scoped_refptr<ShaderClearHelper> helper = this;
 
   while (rv != net::ERR_IO_PENDING) {
     switch (op_type_) {
       case VERIFY_CACHE_SETUP:
         rv = cache_->SetAvailableCallback(
-            base::Bind(&ShaderClearHelper::DoClearShaderCache, this));
+            base::Bind(&ShaderClearHelper::DoClearShaderCache, AsWeakPtr()));
         op_type_ = DELETE_CACHE;
         break;
       case DELETE_CACHE:
         rv = cache_->Clear(
             delete_begin_, delete_end_,
-            base::Bind(&ShaderClearHelper::DoClearShaderCache, this));
+            base::Bind(&ShaderClearHelper::DoClearShaderCache, AsWeakPtr()));
         op_type_ = TERMINATE;
         break;
       case TERMINATE:
         ShaderCacheFactory::GetInstance()->CacheCleared(path_);
         callback_.Run();
         rv = net::ERR_IO_PENDING;  // Break the loop.
         break;
       default:
         NOTREACHED();  // Invalid state provided.
         op_type_ = TERMINATE;
@@ skipping 207 matching lines @@
     const net::CompletionCallback& callback) {
   if (entry_map_.empty()) {
     return net::OK;
   }
   cache_complete_callback_ = callback;
   return net::ERR_IO_PENDING;
 }
 
 }  // namespace content