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

Unified Diff: content/test/content_test_suite.cc

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
Index: content/test/content_test_suite.cc
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index 1fc9d3590d5ba4a2dd7895842186b1337481515b..20fe4028c1644be5527635b22f7bfdf746181e83 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -8,10 +8,7 @@
#include "content/public/test/test_content_client_initializer.h"
#include "content/test/test_content_client.h"
#include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(USE_AURA)
-#include "ui/aura/test/test_aura_initializer.h"
-#endif
+#include "ui/test/ui_test_initializer.h"
#if defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h"
@@ -45,9 +42,7 @@ namespace content {
ContentTestSuite::ContentTestSuite(int argc, char** argv)
: ContentTestSuiteBase(argc, argv) {
-#if defined(USE_AURA)
- aura_initializer_.reset(new aura::test::TestAuraInitializer);
-#endif
+ ui_test_initializer_.reset(new ui::test::UITestInitializer);
tony 2013/10/31 19:48:34 I'm a bit surprised that none of the content tests
}
ContentTestSuite::~ContentTestSuite() {
« no previous file with comments | « content/test/content_test_suite.h ('k') | ui/aura/aura.gyp » ('j') | ui/aura/aura.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698