diff options
7 files changed, 13 insertions, 22 deletions
diff --git a/sync/engine/directory_commit_contributor.cc b/sync/engine/directory_commit_contributor.cc index d3e0043..f6c2726 100644 --- a/sync/engine/directory_commit_contributor.cc +++ b/sync/engine/directory_commit_contributor.cc @@ -22,10 +22,7 @@ DirectoryCommitContributor::~DirectoryCommitContributor() {} scoped_ptr<CommitContribution> DirectoryCommitContributor::GetContribution(size_t max_entries) { return DirectoryCommitContribution::Build( - dir_, - type_, - max_entries, - debug_info_emitter_).PassAs<CommitContribution>(); + dir_, type_, max_entries, debug_info_emitter_); } } // namespace syncer diff --git a/sync/engine/get_updates_processor_unittest.cc b/sync/engine/get_updates_processor_unittest.cc index d7de5ee..c146c56 100644 --- a/sync/engine/get_updates_processor_unittest.cc +++ b/sync/engine/get_updates_processor_unittest.cc @@ -26,8 +26,7 @@ namespace { scoped_ptr<InvalidationInterface> BuildInvalidation( int64 version, const std::string& payload) { - return MockInvalidation::Build(version, payload) - .PassAs<InvalidationInterface>(); + return MockInvalidation::Build(version, payload); } } // namespace diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index a436722..3c86748 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -235,8 +235,7 @@ class SyncSchedulerTest : public testing::Test { static scoped_ptr<InvalidationInterface> BuildInvalidation( int64 version, const std::string& payload) { - return MockInvalidation::Build(version, payload) - .PassAs<InvalidationInterface>(); + return MockInvalidation::Build(version, payload); } private: diff --git a/sync/internal_api/attachments/attachment_service_impl_unittest.cc b/sync/internal_api/attachments/attachment_service_impl_unittest.cc index 1ce5cc3..eaa02f7 100644 --- a/sync/internal_api/attachments/attachment_service_impl_unittest.cc +++ b/sync/internal_api/attachments/attachment_service_impl_unittest.cc @@ -195,8 +195,8 @@ class AttachmentServiceImplTest : public testing::Test, } attachment_service_.reset( new AttachmentServiceImpl(attachment_store, - uploader.PassAs<AttachmentUploader>(), - downloader.PassAs<AttachmentDownloader>(), + uploader.Pass(), + downloader.Pass(), delegate, base::TimeDelta::FromMinutes(1), base::TimeDelta::FromMinutes(8))); @@ -204,7 +204,7 @@ class AttachmentServiceImplTest : public testing::Test, scoped_ptr<base::MockTimer> timer_to_pass( new base::MockTimer(false, false)); mock_timer_ = timer_to_pass.get(); - attachment_service_->SetTimerForTest(timer_to_pass.PassAs<base::Timer>()); + attachment_service_->SetTimerForTest(timer_to_pass.Pass()); } AttachmentService* attachment_service() { return attachment_service_.get(); } diff --git a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc index afcf360..b6aa9e0 100644 --- a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc +++ b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc @@ -385,7 +385,7 @@ scoped_ptr<HttpResponse> RequestHandler::HandleRequest( scoped_ptr<BasicHttpResponse> response(new BasicHttpResponse); response->set_code(GetStatusCode()); response->set_content_type("text/plain"); - return response.PassAs<HttpResponse>(); + return response.Pass(); } void RequestHandler::SetStatusCode(const net::HttpStatusCode& status_code) { diff --git a/sync/internal_api/attachments/task_queue_unittest.cc b/sync/internal_api/attachments/task_queue_unittest.cc index 5c1aa09..361d49c 100644 --- a/sync/internal_api/attachments/task_queue_unittest.cc +++ b/sync/internal_api/attachments/task_queue_unittest.cc @@ -100,7 +100,7 @@ TEST_F(TaskQueueTest, AddToQueue_NoDuplicates) { TEST_F(TaskQueueTest, Retry) { scoped_ptr<base::MockTimer> timer_to_pass(new base::MockTimer(false, false)); base::MockTimer* mock_timer = timer_to_pass.get(); - queue_->SetTimerForTest(timer_to_pass.PassAs<base::Timer>()); + queue_->SetTimerForTest(timer_to_pass.Pass()); // 1st attempt. queue_->AddToQueue(1); @@ -198,7 +198,7 @@ TEST_F(TaskQueueTest, Cancel) { TEST_F(TaskQueueTest, ResetBackoff) { scoped_ptr<base::MockTimer> timer_to_pass(new base::MockTimer(false, false)); base::MockTimer* mock_timer = timer_to_pass.get(); - queue_->SetTimerForTest(timer_to_pass.PassAs<base::Timer>()); + queue_->SetTimerForTest(timer_to_pass.Pass()); // Add an item, mark it as failed, re-add it and see that we now have a // backoff delay. 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; |