Fix re-entrancy bug in SimpleDataSource::Abort() introduced in r118338.

webkit/media/simple_data_source_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "media/base/filters.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_data_source_host.h"
 #include "media/base/mock_filters.h"
 #include "net/base/net_errors.h"
@@ skipping 109 matching lines @@
   void Redirect(const char* url) {
     GURL redirectUrl(url);
     WebURLRequest newRequest(redirectUrl);
     WebURLResponse redirectResponse(gurl_);
 
     data_source_->willSendRequest(url_loader_, newRequest, redirectResponse);
 
     MessageLoop::current()->RunAllPending();
   }
 
-  void DestroyDataSource() {
+  void StopAndDestroyDataSource() {
     data_source_->Stop(media::NewExpectedClosure());
     MessageLoop::current()->RunAllPending();
-
     data_source_ = NULL;
   }
 
+  void AbortAndDestroyDataSource() {
+    data_source_->Abort();
+    MessageLoop::current()->RunAllPending();
+    data_source_ = NULL;
+  }
+
   void AsyncRead() {
     for (int i = 0; i < kDataSize; ++i) {
       uint8 buffer[1];
 
       EXPECT_CALL(*this, ReadCallback(1));
       data_source_->Read(
           i, 1, buffer,
           base::Bind(&SimpleDataSourceTest::ReadCallback,
                      base::Unretained(this)));
       EXPECT_EQ(static_cast<uint8>(data_[i]), buffer[0]);
@@ skipping 14 matching lines @@
 
   char data_[kDataSize];
 
   DISALLOW_COPY_AND_ASSIGN(SimpleDataSourceTest);
 };
 
 TEST_F(SimpleDataSourceTest, InitializeHTTP) {
   InitializeDataSource(kHttpUrl,
                        media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded();
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 }
 
 TEST_F(SimpleDataSourceTest, InitializeHTTPS) {
   InitializeDataSource(kHttpsUrl,
                        media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded();
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 }
 
 TEST_F(SimpleDataSourceTest, InitializeFile) {
   InitializeDataSource(kFileUrl,
                        media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded();
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 }
 
 TEST_F(SimpleDataSourceTest, InitializeData) {
   url_loader_ = new NiceMock<MockWebURLLoader>();
 
   data_source_ = new SimpleDataSource(MessageLoop::current(),
                                       view_->mainFrame());
   // There is no need to provide a message loop to data source.
   data_source_->set_host(&host_);
   data_source_->SetURLLoaderForTest(url_loader_);
 
   EXPECT_CALL(host_, SetTotalBytes(sizeof(kDataUrlDecoded)));
   EXPECT_CALL(host_, SetBufferedBytes(sizeof(kDataUrlDecoded)));
 
   data_source_->Initialize(GURL(kDataUrl),
       media::NewExpectedStatusCB(media::PIPELINE_OK));
   MessageLoop::current()->RunAllPending();
 
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 }
 
 TEST_F(SimpleDataSourceTest, RequestFailed) {
   InitializeDataSource(kHttpUrl,
       media::NewExpectedStatusCB(media::PIPELINE_ERROR_NETWORK));
   RequestFailed();
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 }
 
 static void OnStatusCB(bool* called, media::PipelineStatus status) {
   *called = true;
 }
 
 TEST_F(SimpleDataSourceTest, StopWhenDownloading) {
   // The callback should be deleted, but not executed.
   // TODO(scherkus): should this really be the behaviour?  Seems strange...
   bool was_called = false;
   InitializeDataSource(kHttpUrl, base::Bind(&OnStatusCB, &was_called));
 
   EXPECT_CALL(*url_loader_, cancel());
-  DestroyDataSource();
+  StopAndDestroyDataSource();
   EXPECT_FALSE(was_called);
 }
 
+TEST_F(SimpleDataSourceTest, AbortWhenDownloading) {
+  // The callback should be deleted, but not executed.
+  // TODO(scherkus): should this really be the behaviour?  Seems strange...
+  bool was_called = false;
+  InitializeDataSource(kHttpUrl, base::Bind(&OnStatusCB, &was_called));
+
+  EXPECT_CALL(*url_loader_, cancel());
+  AbortAndDestroyDataSource();
+  EXPECT_FALSE(was_called);
+}
+
 TEST_F(SimpleDataSourceTest, AsyncRead) {
   InitializeDataSource(kFileUrl,
                        media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded();
   AsyncRead();
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 }
 
 // NOTE: This test will need to be reworked a little once
 // http://code.google.com/p/chromium/issues/detail?id=72578
 // is fixed.
 TEST_F(SimpleDataSourceTest, HasSingleOrigin) {
   // Make sure no redirect case works as expected.
   InitializeDataSource(kHttpUrl,
                        media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded();
   EXPECT_TRUE(data_source_->HasSingleOrigin());
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 
   // Test redirect to the same domain.
   InitializeDataSource(kHttpUrl,
                        media::NewExpectedStatusCB(media::PIPELINE_OK));
   Redirect(kHttpRedirectToSameDomainUrl1);
   RequestSucceeded();
   EXPECT_TRUE(data_source_->HasSingleOrigin());
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 
   // Test redirect twice to the same domain.
   InitializeDataSource(kHttpUrl,
                        media::NewExpectedStatusCB(media::PIPELINE_OK));
   Redirect(kHttpRedirectToSameDomainUrl1);
   Redirect(kHttpRedirectToSameDomainUrl2);
   RequestSucceeded();
   EXPECT_TRUE(data_source_->HasSingleOrigin());
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 
   // Test redirect to a different domain.
   InitializeDataSource(kHttpUrl,
                        media::NewExpectedStatusCB(media::PIPELINE_OK));
   Redirect(kHttpRedirectToDifferentDomainUrl1);
   RequestSucceeded();
   EXPECT_FALSE(data_source_->HasSingleOrigin());
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 
   // Test redirect to the same domain and then to a different domain.
   InitializeDataSource(kHttpUrl,
                        media::NewExpectedStatusCB(media::PIPELINE_OK));
   Redirect(kHttpRedirectToSameDomainUrl1);
   Redirect(kHttpRedirectToDifferentDomainUrl1);
   RequestSucceeded();
   EXPECT_FALSE(data_source_->HasSingleOrigin());
-  DestroyDataSource();
+  StopAndDestroyDataSource();
 }
 
 }  // namespace webkit_media