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

ash/accelerators/accelerator_filter_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 "ui/wm/core/accelerator_filter.h"
 
 #include <memory>
 
 #include "ash/accelerators/accelerator_delegate.h"
 #include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/common/shell_window_ids.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_windows.h"
@@ skipping 143 matching lines @@
   generator.PressKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
   generator.ReleaseKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
   EXPECT_TRUE(session_state_delegate->IsScreenLocked());
   UnblockUserSession();
   EXPECT_FALSE(session_state_delegate->IsScreenLocked());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace test
 }  // namespace ash