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

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

Issue 1128113011: ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix extensions_unittests 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 | « content/renderer/renderer_main.cc ('k') | content/test/content_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 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" 9 #include "content/public/test/content_test_suite_base.h"
10 10
11 #if defined(OS_WIN) 11 #if defined(OS_WIN)
12 #include "base/win/scoped_com_initializer.h" 12 #include "base/win/scoped_com_initializer.h"
13 #endif 13 #endif
14 14
15 #if defined(USE_OZONE)
16 namespace ui {
17 class ClientNativePixmapFactory;
18 } // namespace ui
19 #endif
20
15 namespace content { 21 namespace content {
16 22
17 class ContentTestSuite : public ContentTestSuiteBase { 23 class ContentTestSuite : public ContentTestSuiteBase {
18 public: 24 public:
19 ContentTestSuite(int argc, char** argv); 25 ContentTestSuite(int argc, char** argv);
20 ~ContentTestSuite() override; 26 ~ContentTestSuite() override;
21 27
22 protected: 28 protected:
23 void Initialize() override; 29 void Initialize() override;
24 30
25 private: 31 private:
26 #if defined(OS_WIN) 32 #if defined(OS_WIN)
27 base::win::ScopedCOMInitializer com_initializer_; 33 base::win::ScopedCOMInitializer com_initializer_;
28 #endif 34 #endif
35 #if defined(USE_OZONE)
36 scoped_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
37 #endif
29 38
30 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite); 39 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite);
31 }; 40 };
32 41
33 } // namespace content 42 } // namespace content
34 43
35 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_ 44 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « content/renderer/renderer_main.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698