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

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

Issue 2642113004: chromeos: Remove OS_WIN and OS_CHROMEOS ifdefs from ash/test (Closed)
Patch Set: Created 3 years, 11 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 #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/macros.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)
15 #include "base/win/scoped_com_initializer.h"
16 #endif
17
18 namespace aura { 14 namespace aura {
19 class Env; 15 class Env;
20 } 16 }
21 17
22 namespace ash { 18 namespace ash {
23 namespace test { 19 namespace test {
24 20
25 class AuraShellTestSuite : public base::TestSuite { 21 class AuraShellTestSuite : public base::TestSuite {
26 public: 22 public:
27 AuraShellTestSuite(int argc, char** argv); 23 AuraShellTestSuite(int argc, char** argv);
28 ~AuraShellTestSuite() override; 24 ~AuraShellTestSuite() override;
29 25
30 protected: 26 protected:
31 // base::TestSuite: 27 // base::TestSuite:
32 void Initialize() override; 28 void Initialize() override;
33 void Shutdown() override; 29 void Shutdown() override;
34 30
35 private: 31 private:
36 #if defined(OS_WIN)
37 std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_;
38 #endif
39 std::unique_ptr<aura::Env> env_; 32 std::unique_ptr<aura::Env> env_;
40 33
41 base::TestDiscardableMemoryAllocator discardable_memory_allocator_; 34 base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
35
36 DISALLOW_COPY_AND_ASSIGN(AuraShellTestSuite);
42 }; 37 };
43 38
44 } // namespace test 39 } // namespace test
45 } // namespace ash 40 } // namespace ash
46 41
47 #endif // ASH_TEST_TEST_SUITE_H_ 42 #endif // ASH_TEST_TEST_SUITE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698