base::Bind: Remove callback_old.h.

base/callback_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/callback.h"
 #include "base/callback_internal.h"
-#include "base/callback_old.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 namespace {
 
 class HelperObject {
  public:
   HelperObject() : next_number_(0) { }
@@ skipping 37 matching lines @@
 }  // namespace internal
 
 namespace {
 
 typedef internal::BindState<void(void), void(void), void(FakeInvoker)>
     FakeBindState1;
 typedef internal::BindState<void(void), void(void),
                             void(FakeInvoker, FakeInvoker)>
    FakeBindState2;
 
-TEST(CallbackOld, OneArg) {
-  HelperObject obj;
-  scoped_ptr<Callback1<int*>::Type> callback(
-      NewCallback(&obj, &HelperObject::GetNextNumberArg));
-
-  int number = 0;
-  callback->Run(&number);
-  EXPECT_EQ(number, 1);
-}
-
-TEST(CallbackOld, ReturnValue) {
-  HelperObject obj;
-  scoped_ptr<CallbackWithReturnValue<int>::Type> callback(
-      NewCallbackWithReturnValue(&obj, &HelperObject::GetNextNumber));
-
-  EXPECT_EQ(callback->Run(), 1);
-}
-
 class CallbackTest : public ::testing::Test {
  public:
   CallbackTest()
       : callback_a_(new FakeBindState1()),
         callback_b_(new FakeBindState2()) {
   }
 
   virtual ~CallbackTest() {
   }
 
@@ skipping 51 matching lines @@
   ASSERT_FALSE(callback_a_.Equals(null_callback_));
 
   callback_a_.Reset();
 
   EXPECT_TRUE(callback_a_.is_null());
   EXPECT_TRUE(callback_a_.Equals(null_callback_));
 }
 
 }  // namespace
 }  // namespace base