Migrate Pipeline & PipelineImpl to PipelineStatusCB.

webkit/glue/media/simple_data_source_unittest.cc

 // Copyright (c) 2011 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_filter_host.h"
 #include "media/base/mock_filters.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoader.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 42 matching lines @@
     for (int i = 0; i < kDataSize; ++i) {
       data_[i] = i;
     }
   }
 
   virtual ~SimpleDataSourceTest() {
     view_->close();
   }
 
   void InitializeDataSource(const char* url,
-                            media::MockStatusCallback* callback) {
+                            const media::PipelineStatusCB& callback) {
     gurl_ = GURL(url);
 
     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_);
@@ skipping 79 matching lines @@
   MockWebFrameClient client_;
   WebView* view_;
 
   char data_[kDataSize];
 
   DISALLOW_COPY_AND_ASSIGN(SimpleDataSourceTest);
 };
 
 TEST_F(SimpleDataSourceTest, InitializeHTTP) {
   InitializeDataSource(kHttpUrl,
-                       media::NewExpectedStatusCallback(media::PIPELINE_OK));
+                       media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded(false);
   DestroyDataSource();
 }
 
 TEST_F(SimpleDataSourceTest, InitializeHTTPS) {
   InitializeDataSource(kHttpsUrl,
-                       media::NewExpectedStatusCallback(media::PIPELINE_OK));
+                       media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded(false);
   DestroyDataSource();
 }
 
 TEST_F(SimpleDataSourceTest, InitializeFile) {
   InitializeDataSource(kFileUrl,
-                       media::NewExpectedStatusCallback(media::PIPELINE_OK));
+                       media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded(true);
   DestroyDataSource();
 }
 
 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_, SetLoaded(true));
   EXPECT_CALL(host_, SetTotalBytes(sizeof(kDataUrlDecoded)));
   EXPECT_CALL(host_, SetBufferedBytes(sizeof(kDataUrlDecoded)));
 
   data_source_->Initialize(kDataUrl,
-      media::NewExpectedStatusCallback(media::PIPELINE_OK));
+      media::NewExpectedStatusCB(media::PIPELINE_OK));
   MessageLoop::current()->RunAllPending();
 
   DestroyDataSource();
 }
 
 TEST_F(SimpleDataSourceTest, RequestFailed) {
   InitializeDataSource(kHttpUrl,
-      media::NewExpectedStatusCallback(media::PIPELINE_ERROR_NETWORK));
+      media::NewExpectedStatusCB(media::PIPELINE_ERROR_NETWORK));
   RequestFailed();
   DestroyDataSource();
 }
 
+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...
-  StrictMock<media::MockStatusCallback>* callback =
-      new StrictMock<media::MockStatusCallback>();
-  EXPECT_CALL(*callback, Destructor());
-
-  InitializeDataSource(kHttpUrl, callback);
+  bool wasCalled = false;

[scherkus (not reviewing), 2011/08/09 20:10:20]

woah this ain't java here mister

was_called

[acolwell GONE FROM CHROMIUM, 2011/08/09 20:36:48]

Done. Old habits die hard. :/

+  InitializeDataSource(kHttpUrl, base::Bind(&OnStatusCB, &wasCalled));
 
   EXPECT_CALL(*url_loader_, cancel());
   DestroyDataSource();
+  EXPECT_FALSE(wasCalled);
 }
 
 TEST_F(SimpleDataSourceTest, AsyncRead) {
   InitializeDataSource(kFileUrl,
-                       media::NewExpectedStatusCallback(media::PIPELINE_OK));
+                       media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded(true);
   AsyncRead();
   DestroyDataSource();
 }
 
 // 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::NewExpectedStatusCallback(media::PIPELINE_OK));
+                       media::NewExpectedStatusCB(media::PIPELINE_OK));
   RequestSucceeded(false);
   EXPECT_TRUE(data_source_->HasSingleOrigin());
   DestroyDataSource();
 
   // Test redirect to the same domain.
   InitializeDataSource(kHttpUrl,
-                       media::NewExpectedStatusCallback(media::PIPELINE_OK));
+                       media::NewExpectedStatusCB(media::PIPELINE_OK));
   Redirect(kHttpRedirectToSameDomainUrl1);
   RequestSucceeded(false);
   EXPECT_TRUE(data_source_->HasSingleOrigin());
   DestroyDataSource();
 
   // Test redirect twice to the same domain.
   InitializeDataSource(kHttpUrl,
-                       media::NewExpectedStatusCallback(media::PIPELINE_OK));
+                       media::NewExpectedStatusCB(media::PIPELINE_OK));
   Redirect(kHttpRedirectToSameDomainUrl1);
   Redirect(kHttpRedirectToSameDomainUrl2);
   RequestSucceeded(false);
   EXPECT_TRUE(data_source_->HasSingleOrigin());
   DestroyDataSource();
 
   // Test redirect to a different domain.
   InitializeDataSource(kHttpUrl,
-                       media::NewExpectedStatusCallback(media::PIPELINE_OK));
+                       media::NewExpectedStatusCB(media::PIPELINE_OK));
   Redirect(kHttpRedirectToDifferentDomainUrl1);
   RequestSucceeded(false);
   EXPECT_FALSE(data_source_->HasSingleOrigin());
   DestroyDataSource();
 
   // Test redirect to the same domain and then to a different domain.
   InitializeDataSource(kHttpUrl,
-                       media::NewExpectedStatusCallback(media::PIPELINE_OK));
+                       media::NewExpectedStatusCB(media::PIPELINE_OK));
   Redirect(kHttpRedirectToSameDomainUrl1);
   Redirect(kHttpRedirectToDifferentDomainUrl1);
   RequestSucceeded(false);
   EXPECT_FALSE(data_source_->HasSingleOrigin());
   DestroyDataSource();
 }
 
 }  // namespace webkit_glue