From 494aa0ac24d13bdc01d6ebc716f3a3d8314a344a Mon Sep 17 00:00:00 2001
From: dcheng <dcheng@chromium.org>
Date: Thu, 16 Oct 2014 14:37:42 -0700
Subject: 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}
---
 sync/engine/directory_commit_contributor.cc   | 5 +----
 sync/engine/get_updates_processor_unittest.cc | 3 +--
 sync/engine/sync_scheduler_unittest.cc        | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'sync/engine')

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:
-- 
cgit v1.1