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

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

Issue 1165913002: [Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 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 "base/values.h" 6 #include "base/values.h"
6 #include "chrome/browser/browser_process_impl.h" 7 #include "chrome/browser/browser_process_impl.h"
7 #include "chrome/browser/extensions/extension_api_unittest.h" 8 #include "chrome/browser/extensions/extension_api_unittest.h"
8 #include "chrome/browser/extensions/test_extension_system.h" 9 #include "chrome/browser/extensions/test_extension_system.h"
9 #include "chrome/browser/profiles/profile_manager.h" 10 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/test/base/testing_browser_process.h" 11 #include "chrome/test/base/testing_browser_process.h"
11 #include "extensions/browser/api/api_resource_manager.h" 12 #include "extensions/browser/api/api_resource_manager.h"
12 #include "extensions/browser/api/socket/socket.h" 13 #include "extensions/browser/api/socket/socket.h"
13 #include "extensions/browser/api/socket/socket_api.h" 14 #include "extensions/browser/api/socket/socket_api.h"
14 #include "testing/gmock/include/gmock/gmock.h" 15 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
16 17
17 namespace extensions { 18 namespace extensions {
18 19
19 KeyedService* ApiResourceManagerTestFactory(content::BrowserContext* context) { 20 scoped_ptr<KeyedService> ApiResourceManagerTestFactory(
21 content::BrowserContext* context) {
20 content::BrowserThread::ID id; 22 content::BrowserThread::ID id;
21 CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id)); 23 CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
22 return ApiResourceManager<Socket>::CreateApiResourceManagerForTest(context, 24 return ApiResourceManager<Socket>::CreateApiResourceManagerForTest(context,
23 id); 25 id);
24 } 26 }
25 27
26 class SocketUnitTest : public ExtensionApiUnittest { 28 class SocketUnitTest : public ExtensionApiUnittest {
27 public: 29 public:
28 void SetUp() override { 30 void SetUp() override {
29 ExtensionApiUnittest::SetUp(); 31 ExtensionApiUnittest::SetUp();
(...skipping 12 matching lines...) Expand all
42 SocketCreateFunction* function = new SocketCreateFunction(); 44 SocketCreateFunction* function = new SocketCreateFunction();
43 function->set_work_thread_id(id); 45 function->set_work_thread_id(id);
44 46
45 // Run tests 47 // Run tests
46 scoped_ptr<base::DictionaryValue> result( 48 scoped_ptr<base::DictionaryValue> result(
47 RunFunctionAndReturnDictionary(function, "[\"tcp\"]")); 49 RunFunctionAndReturnDictionary(function, "[\"tcp\"]"));
48 ASSERT_TRUE(result.get()); 50 ASSERT_TRUE(result.get());
49 } 51 }
50 52
51 } // namespace extensions 53 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698