Leak fix in FileSystemOperationUnitTest.

BUG=83944
TEST=valgrind bots green

Review URL: http://codereview.chromium.org/7053029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86792 0039d316-1c4b-4281-b951-d872f2087c98

tools/heapcheck/suppressions.txt

@@ -1610,9 +1610,3 @@
    fun:net::ClientSocketPoolManager::InitSocketHandleForRawConnect
    fun:notifier::ProxyResolvingClientSocket::ProcessProxyResolveDone
 }
-{
-   bug_83944
-   Heapcheck:Leak
-   ...
-   fun:fileapi::FileSystemOperationTest::SetUp
-}

tools/valgrind/memcheck/suppressions.txt

@@ -4650,12 +4650,6 @@
    fun:_ZN3net17UDPSocketLibevent15DidCompleteReadEv
    fun:_ZN3net17UDPSocketLibevent11ReadWatcher28OnFileCanReadWithoutBlockingEi
 }
-{
-   bug_83944_a
-   Memcheck:Leak
-   ...
-   fun:_ZN7fileapi23FileSystemOperationTest5SetUpEv
-}
 {
    bug_83944_b
    Memcheck:Addr1

webkit/fileapi/file_system_operation_unittest.cc

@@ -88,10 +88,29 @@ class MockQuotaManagerProxy : public QuotaManagerProxy {
  public:
   explicit MockQuotaManagerProxy(QuotaManager* quota_manager)
       : QuotaManagerProxy(quota_manager,
-                          base::MessageLoopProxy::CreateForCurrentThread()) {}
+                          base::MessageLoopProxy::CreateForCurrentThread()),
+        registered_client_(NULL) {
+  }
+
+  virtual ~MockQuotaManagerProxy() {
+    EXPECT_FALSE(registered_client_);
+  }
+
+  virtual void RegisterClient(QuotaClient* client) {
+    EXPECT_FALSE(registered_client_);
+    registered_client_ = client;
+  }
+
+  void SimulateQuotaManagerDestroyed() {
+    if (registered_client_) {
+      // We cannot call this in the destructor as the client (indirectly)
+      // holds a refptr of the proxy.
+      registered_client_->OnQuotaManagerDestroyed();
+      registered_client_ = NULL;
+    }
+  }
 
   // We don't mock them.
-  virtual void RegisterClient(QuotaClient* client) OVERRIDE {}
   virtual void NotifyOriginInUse(const GURL& origin) OVERRIDE {}
   virtual void NotifyOriginNoLongerInUse(const GURL& origin) OVERRIDE {}
 
@@ -120,6 +139,7 @@ class MockQuotaManagerProxy : public QuotaManagerProxy {
   MockQuotaManager* mock_manager() const {
     return static_cast<MockQuotaManager*>(quota_manager());
   }
+  QuotaClient* registered_client_;
 };
 
 FilePath ASCIIToFilePath(const std::string& str) {
@@ -287,6 +307,8 @@ void FileSystemOperationTest::SetUp() {
 }
 
 void FileSystemOperationTest::TearDown() {
+  // Let the client go away before dropping a ref of the quota manager proxy.
+  quota_manager_proxy()->SimulateQuotaManagerDestroyed();
   quota_manager_ = NULL;
   quota_manager_proxy_ = NULL;
   test_helper_.TearDown();