Last sets of tests that can move to common_unittests

ash/test/ash_test_base.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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/test/test_session_state_delegate.h"
@@ skipping 340 matching lines @@
   }
 }
 
 void AshTestBase::UnblockUserSession() {
   WmShell::Get()->GetSessionStateDelegate()->UnlockScreen();
   SetSessionStarted(true);
   SetUserAddingScreenRunning(false);
 }
 
 void AshTestBase::DisableIME() {
+  // The functionality done here doesn't make sense in mash.

[msw, 2017/03/07 21:36:01]

nit: elaborate on this comment, cite a bug?

[sky, 2017/03/07 21:43:30]

There is no bug, but I expanded the comment.

+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   Shell::GetInstance()->RemovePreTargetHandler(
       Shell::GetInstance()
           ->window_tree_host_manager()
           ->input_method_event_handler());
 }
 
 display::DisplayManager* AshTestBase::display_manager() {
   return Shell::GetInstance()->display_manager();
 }
 
@@ skipping 22 matching lines @@
   Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId(
       display_manager()->GetSecondaryDisplay().id());
 }
 
 display::Display AshTestBase::GetSecondaryDisplay() {
   return ash_test_helper_->GetSecondaryDisplay();
 }
 
 }  // namespace test
 }  // namespace ash