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

Side by Side Diff: cc/test/cc_test_suite.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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 | « cc/test/animation_timelines_test_common.cc ('k') | cc/test/fake_channel_impl.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 CC_TEST_CC_TEST_SUITE_H_ 5 #ifndef CC_TEST_CC_TEST_SUITE_H_
6 #define CC_TEST_CC_TEST_SUITE_H_ 6 #define CC_TEST_CC_TEST_SUITE_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/test/test_discardable_memory_allocator.h" 11 #include "base/test/test_discardable_memory_allocator.h"
11 #include "base/test/test_suite.h" 12 #include "base/test/test_suite.h"
12 13
13 namespace base { 14 namespace base {
14 class MessageLoop; 15 class MessageLoop;
15 } 16 }
16 17
17 namespace cc { 18 namespace cc {
18 19
19 class CCTestSuite : public base::TestSuite { 20 class CCTestSuite : public base::TestSuite {
20 public: 21 public:
21 CCTestSuite(int argc, char** argv); 22 CCTestSuite(int argc, char** argv);
22 ~CCTestSuite() override; 23 ~CCTestSuite() override;
23 24
24 protected: 25 protected:
25 // Overridden from base::TestSuite: 26 // Overridden from base::TestSuite:
26 void Initialize() override; 27 void Initialize() override;
27 void Shutdown() override; 28 void Shutdown() override;
28 29
29 private: 30 private:
30 scoped_ptr<base::MessageLoop> message_loop_; 31 std::unique_ptr<base::MessageLoop> message_loop_;
31 32
32 base::TestDiscardableMemoryAllocator discardable_memory_allocator_; 33 base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
33 DISALLOW_COPY_AND_ASSIGN(CCTestSuite); 34 DISALLOW_COPY_AND_ASSIGN(CCTestSuite);
34 }; 35 };
35 36
36 } // namespace cc 37 } // namespace cc
37 38
38 #endif // CC_TEST_CC_TEST_SUITE_H_ 39 #endif // CC_TEST_CC_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « cc/test/animation_timelines_test_common.cc ('k') | cc/test/fake_channel_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698