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

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

Issue 10383298: Move RegisterContentSchemes from public url_constants into non-public url_schemes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: allow content/common/savable_url_schemes.h to be included by url_constants.cc Created 8 years, 6 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/renderer/render_view_impl.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 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/test/test_suite.h"
11 #include "base/win/scoped_com_initializer.h" 10 #include "base/win/scoped_com_initializer.h"
11 #include "content/test/content_test_suite_base.h"
12 12
13 #if defined(USE_AURA) 13 #if defined(USE_AURA)
14 namespace aura { 14 namespace aura {
15 namespace test { 15 namespace test {
16 class TestAuraInitializer; 16 class TestAuraInitializer;
17 } // namespace test 17 } // namespace test
18 } // namespace aura 18 } // namespace aura
19 #endif 19 #endif
20 20
21 class ContentTestSuite : public base::TestSuite { 21 namespace content {
22
23 class ContentTestSuite : public ContentTestSuiteBase {
22 public: 24 public:
23 ContentTestSuite(int argc, char** argv); 25 ContentTestSuite(int argc, char** argv);
24 virtual ~ContentTestSuite(); 26 virtual ~ContentTestSuite();
25 27
26 protected: 28 protected:
27 virtual void Initialize() OVERRIDE; 29 virtual void Initialize() OVERRIDE;
28 30
31 virtual ContentClient* CreateClientForInitialization() OVERRIDE;
32
29 private: 33 private:
30 base::win::ScopedCOMInitializer com_initializer_; 34 base::win::ScopedCOMInitializer com_initializer_;
31 35
32 #if defined(USE_AURA) 36 #if defined(USE_AURA)
33 scoped_ptr<aura::test::TestAuraInitializer> aura_initializer_; 37 scoped_ptr<aura::test::TestAuraInitializer> aura_initializer_;
34 #endif 38 #endif
35 39
36 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite); 40 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite);
37 }; 41 };
38 42
43 } // namespace content
44
39 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_ 45 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698