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

Unified 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, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/content_test_suite.h
diff --git a/content/test/content_test_suite.h b/content/test/content_test_suite.h
index bff61de5a393afd95bac7f8f973572f40d49183c..d282182735207f6936e68b7db0afe684e3dc5233 100644
--- a/content/test/content_test_suite.h
+++ b/content/test/content_test_suite.h
@@ -7,8 +7,8 @@
#pragma once
#include "base/compiler_specific.h"
-#include "base/test/test_suite.h"
#include "base/win/scoped_com_initializer.h"
+#include "content/test/content_test_suite_base.h"
#if defined(USE_AURA)
namespace aura {
@@ -18,7 +18,9 @@ class TestAuraInitializer;
} // namespace aura
#endif
-class ContentTestSuite : public base::TestSuite {
+namespace content {
+
+class ContentTestSuite : public ContentTestSuiteBase {
public:
ContentTestSuite(int argc, char** argv);
virtual ~ContentTestSuite();
@@ -26,6 +28,8 @@ class ContentTestSuite : public base::TestSuite {
protected:
virtual void Initialize() OVERRIDE;
+ virtual ContentClient* CreateClientForInitialization() OVERRIDE;
+
private:
base::win::ScopedCOMInitializer com_initializer_;
@@ -36,4 +40,6 @@ class ContentTestSuite : public base::TestSuite {
DISALLOW_COPY_AND_ASSIGN(ContentTestSuite);
};
+} // namespace content
+
#endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_
« 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