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

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: 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 | « content/test/content_test_suite.cc ('k') | ui/base/test/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..bd03d4fceeab48ac90dab80990bdd2d824abddaf 100644
--- a/ui/app_list/test/run_all_unittests.cc
+++ b/ui/app_list/test/run_all_unittests.cc
@@ -12,7 +12,9 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
-#if !defined(OS_MACOSX)
+#if defined(OS_MACOSX)
+#include "base/test/mock_chrome_application_mac.h"
+#else
#include "ui/gl/gl_surface.h"
#endif
@@ -24,7 +26,9 @@ class AppListTestSuite : public base::TestSuite {
protected:
virtual void Initialize() override {
-#if !defined(OS_MACOSX)
+#if defined(OS_MACOSX)
+ mock_cr_app::RegisterMockCrApp();
+#else
gfx::GLSurface::InitializeOneOffForTests();
#endif
base::TestSuite::Initialize();
« no previous file with comments | « content/test/content_test_suite.cc ('k') | ui/base/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698