| Index: sync/sessions/nudge_tracker_unittest.cc
|
| diff --git a/sync/sessions/nudge_tracker_unittest.cc b/sync/sessions/nudge_tracker_unittest.cc
|
| index 50b596b7f6120e44d642b1b3373c9a0d527eb0ac..c6a9dfb808de851eee8c2c76d677646a338519a3 100644
|
| --- a/sync/sessions/nudge_tracker_unittest.cc
|
| +++ b/sync/sessions/nudge_tracker_unittest.cc
|
| @@ -67,13 +67,11 @@ class NudgeTrackerTest : public ::testing::Test {
|
| scoped_ptr<InvalidationInterface> BuildInvalidation(
|
| int64 version,
|
| const std::string& payload) {
|
| - return MockInvalidation::Build(version, payload)
|
| - .PassAs<InvalidationInterface>();
|
| + return MockInvalidation::Build(version, payload);
|
| }
|
|
|
| static scoped_ptr<InvalidationInterface> BuildUnknownVersionInvalidation() {
|
| - return MockInvalidation::BuildUnknownVersion()
|
| - .PassAs<InvalidationInterface>();
|
| + return MockInvalidation::BuildUnknownVersion();
|
| }
|
|
|
| protected:
|
| @@ -830,8 +828,7 @@ class NudgeTrackerAckTrackingTest : public NudgeTrackerTest {
|
| int id = inv->GetTrackingId();
|
|
|
| // Send it to the NudgeTracker.
|
| - nudge_tracker_.RecordRemoteInvalidation(
|
| - type, inv.PassAs<InvalidationInterface>());
|
| + nudge_tracker_.RecordRemoteInvalidation(type, inv.Pass());
|
|
|
| // Return its ID to the test framework for use in assertions.
|
| return id;
|
| @@ -844,8 +841,7 @@ class NudgeTrackerAckTrackingTest : public NudgeTrackerTest {
|
| int id = inv->GetTrackingId();
|
|
|
| // Send it to the NudgeTracker.
|
| - nudge_tracker_.RecordRemoteInvalidation(
|
| - type, inv.PassAs<InvalidationInterface>());
|
| + nudge_tracker_.RecordRemoteInvalidation(type, inv.Pass());
|
|
|
| // Return its ID to the test framework for use in assertions.
|
| return id;
|
|
|