Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

sync/sessions/nudge_tracker_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "sync/internal_api/public/base/model_type_test_util.h"
 #include "sync/sessions/nudge_tracker.h"
 #include "sync/test/mock_invalidation.h"
 #include "sync/test/mock_invalidation_tracker.h"
@@ skipping 49 matching lines @@
   }
 
   void SetInvalidationsInSync() {
     nudge_tracker_.OnInvalidationsEnabled();
     nudge_tracker_.RecordSuccessfulSyncCycle();
   }
 
   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:
   NudgeTracker nudge_tracker_;
 };
 
 // Exercise an empty NudgeTracker.
 // Use with valgrind to detect uninitialized members.
 TEST_F(NudgeTrackerTest, EmptyNudgeTracker) {
   // Now we're at the normal, "idle" state.
@@ skipping 736 matching lines @@
     return tracker_.IsDropped(tracking_id);
   }
 
   int SendInvalidation(ModelType type, int version, const std::string& hint) {
     // Build and register the invalidation.
     scoped_ptr<TrackableMockInvalidation> inv =
         tracker_.IssueInvalidation(version, hint);
     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;
   }
 
   int SendUnknownVersionInvalidation(ModelType type) {
     // Build and register the invalidation.
     scoped_ptr<TrackableMockInvalidation> inv =
         tracker_.IssueUnknownVersionInvalidation();
     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;
   }
 
   bool AllInvalidationsAccountedFor() const {
     return tracker_.AllInvalidationsAccountedFor();
   }
 
   void RecordSuccessfulSyncCycle() {
@@ skipping 104 matching lines @@
   EXPECT_TRUE(IsInvalidationAcknowledged(inv2_id));
   EXPECT_TRUE(IsInvalidationAcknowledged(inv3_id));
   EXPECT_TRUE(IsInvalidationAcknowledged(inv4_id));
   EXPECT_TRUE(IsInvalidationAcknowledged(inv5_id));
 
   EXPECT_TRUE(AllInvalidationsAccountedFor());
 }
 
 }  // namespace sessions
 }  // namespace syncer