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

ui/events/ozone/evdev/event_factory_evdev.cc

 // Copyright 2014 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 "ui/events/ozone/evdev/event_factory_evdev.h"
 
 #include <fcntl.h>
 #include <linux/input.h>
 
 #include "base/debug/trace_event.h"
@@ skipping 56 matching lines @@
     const OpenInputDeviceParams& params,
     int fd,
     const EventDeviceInfo& devinfo) {
 #if defined(USE_EVDEV_GESTURES)
   // Touchpad or mouse: use gestures library.
   // EventReaderLibevdevCros -> GestureInterpreterLibevdevCros -> DispatchEvent
   if (UseGesturesLibraryForDevice(devinfo)) {
     scoped_ptr<GestureInterpreterLibevdevCros> gesture_interp =
         make_scoped_ptr(new GestureInterpreterLibevdevCros(
             params.modifiers, params.cursor, params.dispatch_callback));
     scoped_ptr<EventReaderLibevdevCros> libevdev_reader =

[sky, 2014/10/15 19:11:39]

Can't the return be here?

[dcheng, 2014/10/15 19:20:33]

Done.

         make_scoped_ptr(new EventReaderLibevdevCros(
-            fd,
-            params.path,
-            params.id,
-            gesture_interp.PassAs<EventReaderLibevdevCros::Delegate>()));
-    return libevdev_reader.PassAs<EventConverterEvdev>();
+            fd, params.path, params.id, gesture_interp.Pass()));
+    return libevdev_reader.Pass();
   }
 #endif
 
   // Touchscreen: use TouchEventConverterEvdev.
   scoped_ptr<EventConverterEvdev> converter;
   if (devinfo.HasAbsXY())
     return make_scoped_ptr<EventConverterEvdev>(new TouchEventConverterEvdev(
         fd, params.path, params.id, devinfo, params.dispatch_callback));
 
   // Everything else: use KeyEventConverterEvdev.
@@ skipping 190 matching lines @@
   }
 
   observer->OnTouchscreenDevicesUpdated(touchscreens);
 }
 
 int EventFactoryEvdev::NextDeviceId() {
   return ++last_device_id_;
 }
 
 }  // namespace ui