Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(364)

Side by Side Diff: chrome/browser/extensions/api/socket/socket_api_unittest.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_ptr.h" 5 #include <memory>
6
7 #include "base/memory/ptr_util.h"
6 #include "base/values.h" 8 #include "base/values.h"
7 #include "chrome/browser/browser_process_impl.h" 9 #include "chrome/browser/browser_process_impl.h"
8 #include "chrome/browser/extensions/extension_api_unittest.h" 10 #include "chrome/browser/extensions/extension_api_unittest.h"
9 #include "chrome/browser/extensions/test_extension_system.h" 11 #include "chrome/browser/extensions/test_extension_system.h"
10 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
11 #include "chrome/test/base/testing_browser_process.h" 13 #include "chrome/test/base/testing_browser_process.h"
12 #include "extensions/browser/api/api_resource_manager.h" 14 #include "extensions/browser/api/api_resource_manager.h"
13 #include "extensions/browser/api/socket/socket.h" 15 #include "extensions/browser/api/socket/socket.h"
14 #include "extensions/browser/api/socket/socket_api.h" 16 #include "extensions/browser/api/socket/socket_api.h"
15 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
16 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
17 19
18 namespace extensions { 20 namespace extensions {
19 21
20 scoped_ptr<KeyedService> ApiResourceManagerTestFactory( 22 std::unique_ptr<KeyedService> ApiResourceManagerTestFactory(
21 content::BrowserContext* context) { 23 content::BrowserContext* context) {
22 return make_scoped_ptr(new ApiResourceManager<Socket>(context)); 24 return base::WrapUnique(new ApiResourceManager<Socket>(context));
23 } 25 }
24 26
25 class SocketUnitTest : public ExtensionApiUnittest { 27 class SocketUnitTest : public ExtensionApiUnittest {
26 public: 28 public:
27 void SetUp() override { 29 void SetUp() override {
28 ExtensionApiUnittest::SetUp(); 30 ExtensionApiUnittest::SetUp();
29 31
30 ApiResourceManager<Socket>::GetFactoryInstance()->SetTestingFactoryAndUse( 32 ApiResourceManager<Socket>::GetFactoryInstance()->SetTestingFactoryAndUse(
31 browser()->profile(), ApiResourceManagerTestFactory); 33 browser()->profile(), ApiResourceManagerTestFactory);
32 } 34 }
33 }; 35 };
34 36
35 TEST_F(SocketUnitTest, Create) { 37 TEST_F(SocketUnitTest, Create) {
36 // Get BrowserThread 38 // Get BrowserThread
37 content::BrowserThread::ID id; 39 content::BrowserThread::ID id;
38 CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id)); 40 CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
39 41
40 // Create SocketCreateFunction and put it on BrowserThread 42 // Create SocketCreateFunction and put it on BrowserThread
41 SocketCreateFunction* function = new SocketCreateFunction(); 43 SocketCreateFunction* function = new SocketCreateFunction();
42 function->set_work_thread_id(id); 44 function->set_work_thread_id(id);
43 45
44 // Run tests 46 // Run tests
45 scoped_ptr<base::DictionaryValue> result( 47 std::unique_ptr<base::DictionaryValue> result(
46 RunFunctionAndReturnDictionary(function, "[\"tcp\"]")); 48 RunFunctionAndReturnDictionary(function, "[\"tcp\"]"));
47 ASSERT_TRUE(result.get()); 49 ASSERT_TRUE(result.get());
48 } 50 }
49 51
50 } // namespace extensions 52 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698