| Index: base/callback_unittest.cc
|
| diff --git a/base/callback_unittest.cc b/base/callback_unittest.cc
|
| index e42b933f732970dd01c22631a5f26a65448dad08..1c3db04c10eb5038066e2651a7700695a411a703 100644
|
| --- a/base/callback_unittest.cc
|
| +++ b/base/callback_unittest.cc
|
| @@ -1,10 +1,9 @@
|
| -// 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"
|
|
|
| @@ -62,24 +61,6 @@ 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()
|
|
|