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

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

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