mash: Use ash shell window container ids instead of ash::mojom::Container

ash/wm/root_window_layout_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 "ash/common/shell_window_ids.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window_observer.h"
 
 namespace ash {
 namespace {
 
 class WindowDeleter : public aura::WindowObserver {
  public:
@@ skipping 21 matching lines @@
       kShellWindowId_WallpaperContainer);
   aura::Window* w1 = aura::test::CreateTestWindowWithId(1, parent);
   aura::Window* w2 = aura::test::CreateTestWindowWithId(2, parent);
   WindowDeleter deleter(w1);
   w2->AddObserver(&deleter);
   UpdateDisplay("600x500");
   w2->RemoveObserver(&deleter);
 }
 
 }  // namespace ash