base::Bind: Remove Task.

content/browser/browser_thread_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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/test/test_browser_thread.h"
@@ skipping 23 matching lines @@
   }
 
   static void BasicFunction(MessageLoop* message_loop) {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
     message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
   static void DoNothing() {
   }
 
-  class DummyTask : public Task {
-   public:
-    explicit DummyTask(bool* deleted) : deleted_(deleted) { }
-    ~DummyTask() {
-      *deleted_ = true;
-    }
-
-    void Run() {
-      CHECK(false);
-    }
-
-   private:
-    bool* deleted_;
-  };
-
   class DeletedOnFile
       : public base::RefCountedThreadSafe<
             DeletedOnFile, BrowserThread::DeleteOnFileThread> {
    public:
     explicit DeletedOnFile(MessageLoop* message_loop)
         : message_loop_(message_loop) { }
 
     ~DeletedOnFile() {
       CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
       message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
@@ skipping 25 matching lines @@
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&BasicFunction, MessageLoop::current()));
   MessageLoop::current()->Run();
 }
 
 TEST_F(BrowserThreadTest, Release) {
   BrowserThread::ReleaseSoon(BrowserThread::UI, FROM_HERE, this);
   MessageLoop::current()->Run();
 }
 
-TEST_F(BrowserThreadTest, TaskToNonExistentThreadIsDeleted) {
-  bool deleted = false;
-  BrowserThread::PostTask(
-      BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
-      new DummyTask(&deleted));
-  EXPECT_TRUE(deleted);
-}
-
 TEST_F(BrowserThreadTest, ReleasedOnCorrectThread) {
   {
     scoped_refptr<DeletedOnFile> test(
         new DeletedOnFile(MessageLoop::current()));
   }
   MessageLoop::current()->Run();
 }
 
 TEST_F(BrowserThreadTest, NotReleasedIfTargetThreadNonExistent) {
   scoped_refptr<NeverDeleted> test(new NeverDeleted());
@@ skipping 19 matching lines @@
   // MessageLoopProxy test.  This just makes sure we get piped through at all.
   ASSERT_TRUE(BrowserThread::PostTaskAndReply(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&BrowserThreadTest::DoNothing),
       base::Bind(&MessageLoop::Quit,
                  base::Unretained(MessageLoop::current()->current()))));
   MessageLoop::current()->Run();
 }
 
-
-TEST_F(BrowserThreadTest, TaskToNonExistentThreadIsDeletedViaMessageLoopProxy) {
-  bool deleted = false;
-  scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
-      BrowserThread::GetMessageLoopProxyForThread(
-          BrowserThread::WEBKIT_DEPRECATED);
-  message_loop_proxy->PostTask(FROM_HERE, new DummyTask(&deleted));
-  EXPECT_TRUE(deleted);
 }
-
-TEST_F(BrowserThreadTest, PostTaskViaMessageLoopProxyAfterThreadExits) {
-  scoped_ptr<BrowserThreadImpl> io_thread(
-      new BrowserThreadImpl(BrowserThread::IO));
-  io_thread->Start();
-  io_thread->Stop();
-
-  bool deleted = false;
-  scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
-  bool ret = message_loop_proxy->PostTask(FROM_HERE, new DummyTask(&deleted));
-  EXPECT_FALSE(ret);
-  EXPECT_TRUE(deleted);
-}
-
-TEST_F(BrowserThreadTest, PostTaskViaMessageLoopProxyAfterThreadIsDeleted) {
-  {
-    scoped_ptr<BrowserThreadImpl> io_thread(
-        new BrowserThreadImpl(BrowserThread::IO));
-    io_thread->Start();
-  }
-  bool deleted = false;
-  scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
-  bool ret = message_loop_proxy->PostTask(FROM_HERE, new DummyTask(&deleted));
-  EXPECT_FALSE(ret);
-  EXPECT_TRUE(deleted);
-}
-
-}