summaryrefslogtreecommitdiffstats
path: root/base/callback_unittest.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 19:36:57 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 19:36:57 +0000
commit4c03b2e97c1880278c0679680f6eeb6d0154cd53 (patch)
treef843c17952e8f668c2590738fd1ee46d25efea58 /base/callback_unittest.cc
parent3d27b13ffd8bbdc963b93b71d7ec41cf8729599f (diff)
downloadchromium_src-4c03b2e97c1880278c0679680f6eeb6d0154cd53.zip
chromium_src-4c03b2e97c1880278c0679680f6eeb6d0154cd53.tar.gz
chromium_src-4c03b2e97c1880278c0679680f6eeb6d0154cd53.tar.bz2
base::Bind: Remove callback_old.h.
BUG=none TEST=none R=groby,awong,csilv Review URL: http://codereview.chromium.org/9028009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/callback_unittest.cc')
-rw-r--r--base/callback_unittest.cc21
1 files changed, 1 insertions, 20 deletions
diff --git a/base/callback_unittest.cc b/base/callback_unittest.cc
index e42b933..1c3db04 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()