Revert of Mojo: Convert some scoped_ptr<...>(new ...) to make_scoped_ptr(new ...) in mojo/{embedder,system}.

mojo/embedder/test_embedder.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 "mojo/embedder/test_embedder.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/embedder/embedder.h"
@@ skipping 24 matching lines @@
   return false;
 }
 
 }  // namespace internal
 }  // namespace system
 
 namespace embedder {
 namespace test {
 
 void InitWithSimplePlatformSupport() {
-  Init(make_scoped_ptr(new SimplePlatformSupport()));
+  Init(scoped_ptr<PlatformSupport>(new SimplePlatformSupport()));
 }
 
 bool Shutdown() {
   system::Core* core = system::entrypoints::GetCore();
   CHECK(core);
   system::entrypoints::SetCore(nullptr);
 
   bool rv = system::internal::ShutdownCheckNoLeaks(core);
   delete core;
   return rv;
 }
 
 }  // namespace test
 }  // namespace embedder
 
 }  // namespace mojo