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

Cleanup to make future migration to std::move() easier.

BUG=423621

Review URL: https://codereview.chromium.org/660883003

Cr-Commit-Position: refs/heads/master@{#300024}

content/browser/media/capture/desktop_capture_device_unittest.cc

@@ -254,7 +254,7 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeVariableResolution) {
   capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
 
   capture_device_->AllocateAndStart(
-      capture_params, client.PassAs<media::VideoCaptureDevice::Client>());
+      capture_params, client.Pass());
 
   // Capture at least three frames, to ensure that the source frame size has
   // changed at least twice while capturing.

content/child/child_gpu_memory_buffer_manager.cc

@@ -60,7 +60,7 @@ ChildGpuMemoryBufferManager::AllocateGpuMemoryBuffer(
     return scoped_ptr<gfx::GpuMemoryBuffer>();
   }
 
-  return buffer.PassAs<gfx::GpuMemoryBuffer>();
+  return buffer.Pass();
 }
 
 gfx::GpuMemoryBuffer*

content/child/child_thread.cc

@@ -315,7 +315,7 @@ void ChildThread::Init(const Options& options) {
     channel_->AddFilter(power_monitor_source->GetMessageFilter());
 
     power_monitor_.reset(new base::PowerMonitor(
-        power_monitor_source.PassAs<base::PowerMonitorSource>()));
+        power_monitor_source.Pass()));
   }
 
 #if defined(OS_POSIX)

content/child/web_gesture_curve_impl.cc

@@ -33,9 +33,9 @@ scoped_ptr<ui::GestureCurve> CreateDefaultPlatformCurve(
                   INT_MIN,
                   INT_MAX,
                   base::TimeTicks());
-  return scroller.PassAs<ui::GestureCurve>();
+  return scroller.Pass();
 #else
-  return scoped_ptr<ui::GestureCurve>(
+  return make_scoped_ptr(
       new ui::FlingCurve(initial_velocity, base::TimeTicks()));
 #endif
 }

content/common/gpu/media/v4l2_video_device.cc

@@ -18,11 +18,11 @@ scoped_ptr<V4L2Device> V4L2Device::Create(Type type) {
 
   scoped_ptr<ExynosV4L2Device> exynos_device(new ExynosV4L2Device(type));
   if (exynos_device->Initialize())
-    return exynos_device.PassAs<V4L2Device>();
+    return exynos_device.Pass();
 
   scoped_ptr<TegraV4L2Device> tegra_device(new TegraV4L2Device(type));
   if (tegra_device->Initialize())
-    return tegra_device.PassAs<V4L2Device>();
+    return tegra_device.Pass();
 
   LOG(ERROR) << "Failed to create V4L2Device";
   return scoped_ptr<V4L2Device>();

content/common/input/input_param_traits.cc

@@ -21,7 +21,7 @@ scoped_ptr<content::SyntheticGestureParams> ReadGestureParams(
   if (!ReadParam(m, iter, gesture_params.get()))
     return scoped_ptr<content::SyntheticGestureParams>();
 
-  return gesture_params.template PassAs<content::SyntheticGestureParams>();
+  return gesture_params.Pass();
 }
 }  // namespace
 

content/common/input/input_param_traits_unittest.cc

@@ -199,7 +199,7 @@ TEST_F(InputParamTraitsTest, SyntheticSmoothScrollGestureParams) {
   ASSERT_EQ(SyntheticGestureParams::SMOOTH_SCROLL_GESTURE,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
-  packet_in.set_gesture_params(gesture_params.PassAs<SyntheticGestureParams>());
+  packet_in.set_gesture_params(gesture_params.Pass());
 
   Verify(packet_in);
 }
@@ -214,7 +214,7 @@ TEST_F(InputParamTraitsTest, SyntheticPinchGestureParams) {
   ASSERT_EQ(SyntheticGestureParams::PINCH_GESTURE,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
-  packet_in.set_gesture_params(gesture_params.PassAs<SyntheticGestureParams>());
+  packet_in.set_gesture_params(gesture_params.Pass());
 
   Verify(packet_in);
 }
@@ -228,7 +228,7 @@ TEST_F(InputParamTraitsTest, SyntheticTapGestureParams) {
   ASSERT_EQ(SyntheticGestureParams::TAP_GESTURE,
             gesture_params->GetGestureType());
   SyntheticGesturePacket packet_in;
-  packet_in.set_gesture_params(gesture_params.PassAs<SyntheticGestureParams>());
+  packet_in.set_gesture_params(gesture_params.Pass());
 
   Verify(packet_in);
 }

content/public/test/browser_test_utils.cc

@@ -257,7 +257,7 @@ scoped_ptr<net::test_server::HttpResponse> CrossSiteRedirectResponseHandler(
       new net::test_server::BasicHttpResponse);
   http_response->set_code(net::HTTP_MOVED_PERMANENTLY);
   http_response->AddCustomHeader("Location", redirect_target.spec());
-  return http_response.PassAs<net::test_server::HttpResponse>();
+  return http_response.Pass();
 }
 
 }  // namespace

content/shell/browser/shell_url_request_context_getter.cc

@@ -220,7 +220,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
 
     // Set up interceptors in the reverse order.
     scoped_ptr<net::URLRequestJobFactory> top_job_factory =
-        job_factory.PassAs<net::URLRequestJobFactory>();
+        job_factory.Pass();
     for (URLRequestInterceptorScopedVector::reverse_iterator i =
              request_interceptors_.rbegin();
          i != request_interceptors_.rend();

content/test/layouttest_support.cc

@@ -113,7 +113,7 @@ void SetMockGamepadProvider(scoped_ptr<RendererGamepadProvider> provider) {
       ->blink_platform_impl()
       ->SetPlatformEventObserverForTesting(
           blink::WebPlatformEventGamepad,
-          provider.PassAs<PlatformEventObserverBase>());
+          provider.Pass());
 }
 
 void SetMockDeviceLightData(const double data) {

content/test/test_render_frame_host_factory.cc

@@ -30,8 +30,7 @@ TestRenderFrameHostFactory::CreateRenderFrameHost(
   return make_scoped_ptr(
       new TestRenderFrameHost(
           render_view_host, delegate, frame_tree, frame_tree_node, routing_id,
-          is_swapped_out))
-      .PassAs<RenderFrameHostImpl>();
+          is_swapped_out));
 }
 
 }  // namespace content