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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/test/content_test_suite.h

Issue 45753004: ui: Repack resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/DEPS ('k') | content/test/content_test_suite.cc » ('j') | content/test/content_test_suite.cc » ('J')
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 510ab2d9aac70294fc9bdccdf77530b1da935697..570681635cee8edb338bf72f886b7ccc33fa7b11 100644
--- a/content/test/content_test_suite.h
+++ b/content/test/content_test_suite.h
@@ -12,13 +12,11 @@
#include "base/win/scoped_com_initializer.h"
#endif
-#if defined(USE_AURA)
-namespace aura {
+namespace ui {
namespace test {
-class TestAuraInitializer;
-} // namespace test
-} // namespace aura
-#endif
+class UITestInitializer;
+}
+}
namespace content {
@@ -37,9 +35,7 @@ class ContentTestSuite : public ContentTestSuiteBase {
base::win::ScopedCOMInitializer com_initializer_;
#endif
-#if defined(USE_AURA)
- scoped_ptr<aura::test::TestAuraInitializer> aura_initializer_;
-#endif
+ scoped_ptr<ui::test::UITestInitializer> ui_test_initializer_;
DISALLOW_COPY_AND_ASSIGN(ContentTestSuite);
};
« no previous file with comments | « content/test/DEPS ('k') | content/test/content_test_suite.cc » ('j') | content/test/content_test_suite.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698