Last sets of tests that can move to common_unittests

ash/mus/window_manager_unittest.cc

 // Copyright 2015 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 <map>
 #include <memory>
 #include <vector>
 
 #include "ash/public/interfaces/constants.mojom.h"
 #include "base/bind.h"
@@ skipping 44 matching lines @@
   }
 
   base::RunLoop run_loop_;
   wm::WMState wm_state_;
   aura::PropertyConverter property_converter_;
   std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientDelegate);
 };
 
-class WindowManagerTest : public service_manager::test::ServiceTest {
+class MusWindowManagerTest : public service_manager::test::ServiceTest {

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

optional nit: rename file mus_window_manager_unittest.cc

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

I would rather keep the file name matching the name of the class under test
(WindowManager). I added a comment about why the name is inconsistent.

  public:
-  WindowManagerTest() : service_manager::test::ServiceTest("mash_unittests") {}
-  ~WindowManagerTest() override {}
+  MusWindowManagerTest()
+      : service_manager::test::ServiceTest("mash_unittests") {}
+  ~MusWindowManagerTest() override {}
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(WindowManagerTest);
+  DISALLOW_COPY_AND_ASSIGN(MusWindowManagerTest);
 };
 
 void OnEmbed(bool success) {
   ASSERT_TRUE(success);
 }
 
-TEST_F(WindowManagerTest, OpenWindow) {
+TEST_F(MusWindowManagerTest, OpenWindow) {
   display::ScreenBase screen;
   screen.display_list().AddDisplay(
       display::Display(1, gfx::Rect(0, 0, 200, 200)),
       display::DisplayList::Type::PRIMARY);
   display::Screen::SetScreenInstance(&screen);
 
   WindowTreeClientDelegate window_tree_delegate;
 
   connector()->Connect(mojom::kServiceName);
 
@@ skipping 19 matching lines @@
   client.Embed(child_window, std::move(tree_client), 0u, base::Bind(&OnEmbed));
   aura::WindowTreeClient child_client(connector(), &window_tree_delegate,
                                       nullptr, std::move(tree_client_request));
   window_tree_delegate.WaitForEmbed();
   ASSERT_TRUE(!child_client.GetRoots().empty());
   window_tree_delegate.DestroyWindowTreeHost();
 }
 
 }  // namespace mus
 }  // namespace ash