diff options
| author | dcheng <dcheng@chromium.org> | 2014-10-16 14:37:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 21:37:59 +0000 |
| commit | 494aa0ac24d13bdc01d6ebc716f3a3d8314a344a (patch) | |
| tree | d403bb0d71d60160b955c59229323c7289eb11d0 /sync/sessions | |
| parent | ad396f7c3ba3253b0376088c2f11c59e9f4eac96 (diff) | |
| download | chromium_src-494aa0ac24d13bdc01d6ebc716f3a3d8314a344a.zip chromium_src-494aa0ac24d13bdc01d6ebc716f3a3d8314a344a.tar.gz chromium_src-494aa0ac24d13bdc01d6ebc716f3a3d8314a344a.tar.bz2 | |
Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.
BUG=423621
Review URL: https://codereview.chromium.org/657783002
Cr-Commit-Position: refs/heads/master@{#299978}
Diffstat (limited to 'sync/sessions')
| -rw-r--r-- | sync/sessions/nudge_tracker_unittest.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sync/sessions/nudge_tracker_unittest.cc b/sync/sessions/nudge_tracker_unittest.cc index 50b596b..c6a9dfb8 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; |