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

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

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 years, 9 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
« no previous file with comments | « content/test/content_test_launcher.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 namespace content { 15 namespace content {
16 16
17 class ContentTestSuite : public ContentTestSuiteBase { 17 class ContentTestSuite : public ContentTestSuiteBase {
18 public: 18 public:
19 ContentTestSuite(int argc, char** argv); 19 ContentTestSuite(int argc, char** argv);
20 virtual ~ContentTestSuite(); 20 virtual ~ContentTestSuite();
21 21
22 protected: 22 protected:
23 virtual void Initialize() OVERRIDE; 23 virtual void Initialize() OVERRIDE;
24 24
25 virtual ContentClient* CreateClientForInitialization() OVERRIDE;
26
27 private: 25 private:
28 #if defined(OS_WIN) 26 #if defined(OS_WIN)
29 base::win::ScopedCOMInitializer com_initializer_; 27 base::win::ScopedCOMInitializer com_initializer_;
30 #endif 28 #endif
31 29
32 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite); 30 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite);
33 }; 31 };
34 32
35 } // namespace content 33 } // namespace content
36 34
37 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_ 35 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « content/test/content_test_launcher.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698