chromeos: makes more tests run in both mash and ash

ash/shell_unittest.cc

Index: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index fe929cb67bebf1d3a8ca223a1d8697339b1d31fa..881b9720eaa88ff0e3394fd01e08b026ba6d6ed8 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -459,6 +459,10 @@ TEST_F(ShellTest, ToggleAutoHide) {
 // Tests that the cursor-filter is ahead of the drag-drop controller in the
 // pre-target list.
 TEST_F(ShellTest, TestPreTargetHandlerOrder) {
+  // TODO: investigate failure in mash, http://crbug.com/695758.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   Shell* shell = Shell::GetInstance();
   ui::EventTargetTestApi test_api(shell);
   test::ShellTestApi shell_test_api(shell);
@@ -503,6 +507,13 @@ class ShellTest2 : public test::AshTestBase {
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
+  // TODO: delete this test when conversion to mash is done. This test isn't
+  // applicable to mash as all windows must be destroyed before ash, that isn't
+  // the case with classic-ash where embedders can separately create
+  // aura::Windows.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   window_.reset(new aura::Window(NULL));
   window_->Init(ui::LAYER_NOT_DRAWN);
 }