ui: Cleanup the usage of scoped_ptr throughout.

ui/ozone/platform/egltest/ozone_platform_egltest.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/egltest/ozone_platform_egltest.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
@@ skipping 336 matching lines @@
   scoped_ptr<SystemInputInjector> CreateSystemInputInjector() override {
     return nullptr;  // no input injection support.
   }
   scoped_ptr<PlatformWindow> CreatePlatformWindow(
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) override {
     return make_scoped_ptr<PlatformWindow>(new EgltestWindow(
         delegate, &eglplatform_shim_, event_factory_ozone_.get(), bounds));
   }
   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
-    return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());
+    return make_scoped_ptr(new NativeDisplayDelegateOzone());
   }
 
   void InitializeUI() override {
     device_manager_ = CreateDeviceManager();
     if (!surface_factory_ozone_)
       surface_factory_ozone_.reset(
           new SurfaceFactoryEgltest(&eglplatform_shim_));
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
         make_scoped_ptr(new StubKeyboardLayoutEngine()));
     event_factory_ozone_.reset(new EventFactoryEvdev(
@@ skipping 26 matching lines @@
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformEgltest() {
   OzonePlatformEgltest* platform = new OzonePlatformEgltest;
   platform->Initialize();
   return platform;
 }
 
 }  // namespace ui