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

Unified Diff: ui/app_list/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: Ready for review 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
Index: ui/app_list/test/run_all_unittests.cc
diff --git a/ui/app_list/test/run_all_unittests.cc b/ui/app_list/test/run_all_unittests.cc
index 19f0a0c873ccf89715c1ac87fb7570fa12b6c7cb..93244c016985f745f5cbb582e093df5598d59311 100644
--- a/ui/app_list/test/run_all_unittests.cc
+++ b/ui/app_list/test/run_all_unittests.cc
@@ -14,6 +14,8 @@
#if !defined(OS_MACOSX)
Mark Mentovai 2014/10/17 19:44:58 Now that these have an else clause, they’d probabl
Robert Sesek 2014/10/17 21:02:29 Done.
#include "ui/gl/gl_surface.h"
+#else
+#include "base/test/mock_chrome_application_mac.h"
#endif
namespace {
@@ -26,6 +28,8 @@ class AppListTestSuite : public base::TestSuite {
virtual void Initialize() override {
#if !defined(OS_MACOSX)
gfx::GLSurface::InitializeOneOffForTests();
+#else
+ mock_cr_app::RegisterMockCrApp();
#endif
base::TestSuite::Initialize();
ui::RegisterPathProvider();

Powered by Google App Engine
This is Rietveld 408576698