| Index: extensions/browser/api/sockets_tcp/sockets_tcp_api_unittest.cc
|
| diff --git a/extensions/browser/api/sockets_tcp/sockets_tcp_api_unittest.cc b/extensions/browser/api/sockets_tcp/sockets_tcp_api_unittest.cc
|
| index 83c9faeaa39633906c6b27806a05e675c138b14c..fa52b9d5ee92378098241d3303ce2653b2b7ab1a 100644
|
| --- a/extensions/browser/api/sockets_tcp/sockets_tcp_api_unittest.cc
|
| +++ b/extensions/browser/api/sockets_tcp/sockets_tcp_api_unittest.cc
|
| @@ -2,13 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include "extensions/browser/api/sockets_tcp/sockets_tcp_api.h"
|
| +
|
| +#include <memory>
|
| +
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/values.h"
|
| #include "content/public/test/test_browser_context.h"
|
| #include "extensions/browser/api/api_resource_manager.h"
|
| #include "extensions/browser/api/socket/socket.h"
|
| #include "extensions/browser/api/socket/tcp_socket.h"
|
| -#include "extensions/browser/api/sockets_tcp/sockets_tcp_api.h"
|
| #include "extensions/browser/api_unittest.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -16,9 +19,9 @@
|
| namespace extensions {
|
| namespace api {
|
|
|
| -static scoped_ptr<KeyedService> ApiResourceManagerTestFactory(
|
| +static std::unique_ptr<KeyedService> ApiResourceManagerTestFactory(
|
| content::BrowserContext* context) {
|
| - return make_scoped_ptr(new ApiResourceManager<ResumableTCPSocket>(context));
|
| + return base::WrapUnique(new ApiResourceManager<ResumableTCPSocket>(context));
|
| }
|
|
|
| class SocketsTcpUnitTest : public ApiUnitTest {
|
| @@ -42,7 +45,7 @@ TEST_F(SocketsTcpUnitTest, Create) {
|
| function->set_work_thread_id(id);
|
|
|
| // Run tests
|
| - scoped_ptr<base::DictionaryValue> result(RunFunctionAndReturnDictionary(
|
| + std::unique_ptr<base::DictionaryValue> result(RunFunctionAndReturnDictionary(
|
| function, "[{\"persistent\": true, \"name\": \"foo\"}]"));
|
| ASSERT_TRUE(result.get());
|
| }
|
|
|