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

Side by Side Diff: content/test/content_test_suite.h

Issue 10990079: Clean up scoped_com_initializer.h. Remove #ifdefs for non-Windows (this is in base/win, no one sho… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
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 CONTENT_TEST_CONTENT_TEST_SUITE_H_ 5 #ifndef CONTENT_TEST_CONTENT_TEST_SUITE_H_
6 #define CONTENT_TEST_CONTENT_TEST_SUITE_H_ 6 #define CONTENT_TEST_CONTENT_TEST_SUITE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "content/public/test/content_test_suite_base.h"
10
11 #if defined(OS_WIN)
9 #include "base/win/scoped_com_initializer.h" 12 #include "base/win/scoped_com_initializer.h"
10 #include "content/public/test/content_test_suite_base.h" 13 #endif
11 14
12 #if defined(USE_AURA) 15 #if defined(USE_AURA)
13 namespace aura { 16 namespace aura {
14 namespace test { 17 namespace test {
15 class TestAuraInitializer; 18 class TestAuraInitializer;
16 } // namespace test 19 } // namespace test
17 } // namespace aura 20 } // namespace aura
18 #endif 21 #endif
19 22
20 namespace content { 23 namespace content {
21 24
22 class ContentTestSuite : public ContentTestSuiteBase { 25 class ContentTestSuite : public ContentTestSuiteBase {
23 public: 26 public:
24 ContentTestSuite(int argc, char** argv); 27 ContentTestSuite(int argc, char** argv);
25 virtual ~ContentTestSuite(); 28 virtual ~ContentTestSuite();
26 29
27 protected: 30 protected:
28 virtual void Initialize() OVERRIDE; 31 virtual void Initialize() OVERRIDE;
29 32
30 virtual ContentClient* CreateClientForInitialization() OVERRIDE; 33 virtual ContentClient* CreateClientForInitialization() OVERRIDE;
31 34
32 private: 35 private:
36 #if defined(OS_WIN)
33 base::win::ScopedCOMInitializer com_initializer_; 37 base::win::ScopedCOMInitializer com_initializer_;
38 #endif
34 39
35 #if defined(USE_AURA) 40 #if defined(USE_AURA)
36 scoped_ptr<aura::test::TestAuraInitializer> aura_initializer_; 41 scoped_ptr<aura::test::TestAuraInitializer> aura_initializer_;
37 #endif 42 #endif
38 43
39 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite); 44 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite);
40 }; 45 };
41 46
42 } // namespace content 47 } // namespace content
43 48
44 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_ 49 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698