shill: Convert code to use the newest version of libchrome.
The biggest change is a switch from using the deprecated
Task and CallbackN mechanisms to using the new Callback
mechanism.
Note: Original CL was https://gerrit.chromium.org/gerrit/16156.
This is logically another patch to that CL, but since the
latter was already merged, and is considered closed by
Gerrit, it's necessary to create a new CL.
BUG=chromium-os:15330
TEST=Build shill and run it on a zgb with a modem. Build and
run unit tests.
CQ-DEPEND=I37628863370323d30cac493764ea28f8ffd42637
Change-Id: I3ae78a3aa44ec167b79f2170d07650ece888254f
Reviewed-on: https://gerrit.chromium.org/gerrit/18030
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Tested-by: Eric Shienbrood <ers@chromium.org>
Commit-Ready: Eric Shienbrood <ers@chromium.org>
diff --git a/ipconfig_unittest.cc b/ipconfig_unittest.cc
index 19922b3..832285e 100644
--- a/ipconfig_unittest.cc
+++ b/ipconfig_unittest.cc
@@ -4,12 +4,14 @@
#include "shill/ipconfig.h"
-#include <base/callback_old.h>
+#include <base/bind.h>
#include <gtest/gtest.h>
#include "shill/mock_control.h"
#include "shill/mock_store.h"
+using base::Bind;
+using base::Unretained;
using std::string;
using testing::_;
using testing::Return;
@@ -123,7 +125,7 @@
UpdateCallbackTest callback_test(ipconfig_, success);
ASSERT_FALSE(callback_test.called());
ipconfig_->RegisterUpdateCallback(
- NewCallback(&callback_test, &UpdateCallbackTest::Callback));
+ Bind(&UpdateCallbackTest::Callback, Unretained(&callback_test)));
ipconfig_->UpdateProperties(IPConfig::Properties(), success);
EXPECT_TRUE(callback_test.called());
}