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

mojo/system/core_test_base.cc

 // Copyright 2013 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/system/core_test_base.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 157 matching lines @@
 
 // CoreTestBase ----------------------------------------------------------------
 
 CoreTestBase::CoreTestBase() {
 }
 
 CoreTestBase::~CoreTestBase() {
 }
 
 void CoreTestBase::SetUp() {
-  core_ = new Core(make_scoped_ptr(new embedder::SimplePlatformSupport()));
+  core_ = new Core(scoped_ptr<embedder::PlatformSupport>(
+      new embedder::SimplePlatformSupport()));
 }
 
 void CoreTestBase::TearDown() {
   delete core_;
   core_ = nullptr;
 }
 
 MojoHandle CoreTestBase::CreateMockHandle(CoreTestBase::MockHandleInfo* info) {
   CHECK(core_);
   scoped_refptr<MockDispatcher> dispatcher(new MockDispatcher(info));
@@ skipping 158 matching lines @@
 }
 
 void CoreTestBase_MockHandleInfo::IncrementCancelAllWaitersCallCount() {
   base::AutoLock locker(lock_);
   cancel_all_waiters_call_count_++;
 }
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo