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

Side by Side Diff: ash/test/test_suite.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | ash/test/user_metrics_recorder_test_api.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef ASH_TEST_TEST_SUITE_H_ 5 #ifndef ASH_TEST_TEST_SUITE_H_
6 #define ASH_TEST_TEST_SUITE_H_ 6 #define ASH_TEST_TEST_SUITE_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/test/test_discardable_memory_allocator.h" 11 #include "base/test/test_discardable_memory_allocator.h"
10 #include "base/test/test_suite.h" 12 #include "base/test/test_suite.h"
11 13
12 #if defined(OS_WIN) 14 #if defined(OS_WIN)
13 #include "base/memory/scoped_ptr.h"
14 #include "base/win/scoped_com_initializer.h" 15 #include "base/win/scoped_com_initializer.h"
15 #endif 16 #endif
16 17
17 namespace ash { 18 namespace ash {
18 namespace test { 19 namespace test {
19 20
20 class AuraShellTestSuite : public base::TestSuite { 21 class AuraShellTestSuite : public base::TestSuite {
21 public: 22 public:
22 AuraShellTestSuite(int argc, char** argv); 23 AuraShellTestSuite(int argc, char** argv);
23 ~AuraShellTestSuite() override; 24 ~AuraShellTestSuite() override;
24 25
25 protected: 26 protected:
26 // base::TestSuite: 27 // base::TestSuite:
27 void Initialize() override; 28 void Initialize() override;
28 void Shutdown() override; 29 void Shutdown() override;
29 30
30 private: 31 private:
31 #if defined(OS_WIN) 32 #if defined(OS_WIN)
32 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; 33 std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_;
33 #endif 34 #endif
34 35
35 base::TestDiscardableMemoryAllocator discardable_memory_allocator_; 36 base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
36 }; 37 };
37 38
38 } // namespace test 39 } // namespace test
39 } // namespace ash 40 } // namespace ash
40 41
41 #endif // ASH_TEST_TEST_SUITE_H_ 42 #endif // ASH_TEST_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | ash/test/user_metrics_recorder_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698