chromeos: makes more tests run in both mash and ash

ash/shell_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 441 matching lines @@
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
 
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior());
 }
 
 // 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);
 
   const ui::EventHandlerList& handlers = test_api.pre_target_handlers();
   ui::EventHandlerList::const_iterator cursor_filter =
       std::find(handlers.begin(), handlers.end(), shell->mouse_cursor_filter());
   ui::EventHandlerList::const_iterator drag_drop = std::find(
       handlers.begin(), handlers.end(), shell_test_api.drag_drop_controller());
   EXPECT_NE(handlers.end(), cursor_filter);
@@ skipping 24 matching lines @@
   ~ShellTest2() override {}
 
  protected:
   std::unique_ptr<aura::Window> window_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
+  // This test isn't applicable to mash as all windows must be destroyed before
+  // the WindowManager/Shell is. The case of content creating a Window isn't
+  // valid as content is in another process in mash.

[msw, 2017/02/24 21:25:35]

nit: "a separate process from"? (or more to the point, content windows aren't
constructed/embedded in the same manner, even if ash and chrome services were
run in the same process for mash)... Maybe just mention that this test should be
deleted when mash is the only supported configuration.

[sky, 2017/02/24 21:43:47]

Done.

+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   window_.reset(new aura::Window(NULL));
   window_->Init(ui::LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash