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

Unified Diff: ui/gfx/screen_unittest.cc

Issue 8391006: aura: Set up the mock compositor to get gfx_unittests green on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 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 | « no previous file | ui/ui_unittests.gypi » ('j') | ui/ui_unittests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/screen_unittest.cc
diff --git a/ui/gfx/screen_unittest.cc b/ui/gfx/screen_unittest.cc
index 4b1a572ed5addc8f745b4fdc085f3b9d6275c874..6d1f9f2789a9799399eb3593449efc2ef5d0fc13 100644
--- a/ui/gfx/screen_unittest.cc
+++ b/ui/gfx/screen_unittest.cc
@@ -5,30 +5,9 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/screen.h"
-#if defined(USE_AURA)
-#include "base/message_loop.h"
-#include "ui/aura/desktop.h"
-#endif
-
namespace {
-#if defined(USE_AURA)
-class ScreenTest : public testing::Test {
- public:
- ScreenTest() {
- aura::Desktop::GetInstance()->ShowDesktop();
- }
-
- virtual ~ScreenTest() {
- aura::Desktop::GetInstance()->DeleteInstanceForTesting();
- }
-
- private:
- MessageLoopForUI message_loop_;
-};
-#else
typedef testing::Test ScreenTest;
-#endif
TEST_F(ScreenTest, GetPrimaryMonitorSize) {
// We aren't actually testing that it's correct, just that it's sane.
« no previous file with comments | « no previous file | ui/ui_unittests.gypi » ('j') | ui/ui_unittests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698