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

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

Issue 1871253002: aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot.merge 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/ash_interactive_ui_test_base.cc ('k') | ash/test/test_suite.cc » ('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> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/test/test_discardable_memory_allocator.h" 11 #include "base/test/test_discardable_memory_allocator.h"
12 #include "base/test/test_suite.h" 12 #include "base/test/test_suite.h"
13 13
14 #if defined(OS_WIN) 14 #if defined(OS_WIN)
15 #include "base/win/scoped_com_initializer.h" 15 #include "base/win/scoped_com_initializer.h"
16 #endif 16 #endif
17 17
18 namespace aura {
19 class Env;
20 }
21
18 namespace ash { 22 namespace ash {
19 namespace test { 23 namespace test {
20 24
21 class AuraShellTestSuite : public base::TestSuite { 25 class AuraShellTestSuite : public base::TestSuite {
22 public: 26 public:
23 AuraShellTestSuite(int argc, char** argv); 27 AuraShellTestSuite(int argc, char** argv);
24 ~AuraShellTestSuite() override; 28 ~AuraShellTestSuite() override;
25 29
26 protected: 30 protected:
27 // base::TestSuite: 31 // base::TestSuite:
28 void Initialize() override; 32 void Initialize() override;
29 void Shutdown() override; 33 void Shutdown() override;
30 34
31 private: 35 private:
32 #if defined(OS_WIN) 36 #if defined(OS_WIN)
33 std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_; 37 std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_;
34 #endif 38 #endif
39 std::unique_ptr<aura::Env> env_;
35 40
36 base::TestDiscardableMemoryAllocator discardable_memory_allocator_; 41 base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
37 }; 42 };
38 43
39 } // namespace test 44 } // namespace test
40 } // namespace ash 45 } // namespace ash
41 46
42 #endif // ASH_TEST_TEST_SUITE_H_ 47 #endif // ASH_TEST_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « ash/test/ash_interactive_ui_test_base.cc ('k') | ash/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698