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

ui/ozone/platform/dri/gbm_surface_factory.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/ozone/platform/dri/gbm_surface_factory.h"
 
 #include <gbm.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 135 matching lines @@
 }
 
 scoped_ptr<SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
   DCHECK(state_ == INITIALIZED);
 
   DriWindowDelegate* delegate = GetOrCreateWindowDelegate(widget);
 
   scoped_ptr<GbmSurface> surface(new GbmSurface(delegate, device_, drm_));
   if (!surface->Initialize())
-    return scoped_ptr<SurfaceOzoneEGL>();
+    return nullptr;
 
-  return surface.PassAs<SurfaceOzoneEGL>();
+  return surface.Pass();
 }
 
 scoped_ptr<SurfaceOzoneEGL>
 GbmSurfaceFactory::CreateSurfacelessEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
   if (!allow_surfaceless_)
     return scoped_ptr<SurfaceOzoneEGL>();
 
   DriWindowDelegate* delegate = GetOrCreateWindowDelegate(widget);
   return scoped_ptr<SurfaceOzoneEGL>(new GbmSurfaceless(delegate));
@@ skipping 53 matching lines @@
     scoped_ptr<DriWindowDelegate> delegate(
         new DriWindowDelegateImpl(widget, screen_manager_));
     delegate->Initialize();
     window_manager_->AddWindowDelegate(widget, delegate.Pass());
   }
 
   return window_manager_->GetWindowDelegate(widget);
 }
 
 }  // namespace ui