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

Unified Diff: ui/gfx/test/run_all_unittests.cc

Issue 656293003: [Mac] Do not initialize the MockCrApplication in base::TestSuite. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Invert negated conditions Created 6 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 | « ui/base/test/run_all_unittests.cc ('k') | ui/gfx/test/ui_cocoa_test_helper.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/test/run_all_unittests.cc
diff --git a/ui/gfx/test/run_all_unittests.cc b/ui/gfx/test/run_all_unittests.cc
index 5282da19256676e5fafcb01fcdfe3730f43594a7..2c2f4ee7de7228da0cc3d3f185286ee95a54fa1a 100644
--- a/ui/gfx/test/run_all_unittests.cc
+++ b/ui/gfx/test/run_all_unittests.cc
@@ -17,6 +17,10 @@
#include "ui/gfx/android/gfx_jni_registrar.h"
#endif
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+#include "base/test/mock_chrome_application_mac.h"
+#endif
+
namespace {
class GfxTestSuite : public base::TestSuite {
@@ -31,6 +35,10 @@ class GfxTestSuite : public base::TestSuite {
gfx::android::RegisterJni(base::android::AttachCurrentThread());
#endif
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+ mock_cr_app::RegisterMockCrApp();
+#endif
+
ui::RegisterPathProvider();
base::FilePath ui_test_pak_path;
« no previous file with comments | « ui/base/test/run_all_unittests.cc ('k') | ui/gfx/test/ui_cocoa_test_helper.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698