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

Unified Diff: ash/common/devtools/ash_devtools_unittest.cc

Issue 2616023005: cros: Remove OS_CHROMEOS ifdefs in ash/common (Closed)
Patch Set: review comments Created 3 years, 11 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 | « ash/common/ash_switches.cc ('k') | ash/common/mojo_interface_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/devtools/ash_devtools_unittest.cc
diff --git a/ash/common/devtools/ash_devtools_unittest.cc b/ash/common/devtools/ash_devtools_unittest.cc
index 4328f9bf5f2344390d7144a2a5a2bc2393c4730a..9226051862b4907ad383074b3094359dede9fa94 100644
--- a/ash/common/devtools/ash_devtools_unittest.cc
+++ b/ash/common/devtools/ash_devtools_unittest.cc
@@ -400,14 +400,7 @@ TEST_F(AshDevToolsTest, WindowReorganizedChildNodeRearranged) {
ExpectChildNodeInserted(target_node->getNodeId(), sibling_node->getNodeId());
}
-#if defined(OS_WIN)
-#define MAYBE_WindowReorganizedChildNodeRemovedAndInserted \
- DISABLED_WindowReorganizedChildNodeRemovedAndInserted
-#else
-#define MAYBE_WindowReorganizedChildNodeRemovedAndInserted \
- WindowReorganizedChildNodeRemovedAndInserted
-#endif // defined(OS_WIN)
-TEST_F(AshDevToolsTest, MAYBE_WindowReorganizedChildNodeRemovedAndInserted) {
+TEST_F(AshDevToolsTest, WindowReorganizedChildNodeRemovedAndInserted) {
WmWindow* root_window = WmShell::Get()->GetPrimaryRootWindow();
WmWindow* target_window = root_window->GetChildren()[1];
WmWindow* parent_window = root_window->GetChildren()[0];
« no previous file with comments | « ash/common/ash_switches.cc ('k') | ash/common/mojo_interface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698