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

ash/common/test/ash_test.h

 // Copyright 2016 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.
 
 #ifndef ASH_COMMON_TEST_ASH_TEST_H_
 #define ASH_COMMON_TEST_ASH_TEST_H_
 
 #include <memory>
 #include <string>
 
-#include "ash/common/shell_window_ids.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/window_types.h"
 
 namespace display {
 class Display;
 }
@@ skipping 74 matching lines @@
       const gfx::Rect& bounds_in_screen = gfx::Rect(),
       int shell_window_id = kShellWindowId_Invalid);
 
   // Creates a visible window parented to |parent| with the specified bounds and
   // id.
   std::unique_ptr<WindowOwner> CreateChildWindow(
       WmWindow* parent,
       const gfx::Rect& bounds = gfx::Rect(),
       int shell_window_id = kShellWindowId_Invalid);
 
-  // Creates and shows a widget. See ash/common/shell_window_ids.h for values
-  // for |container_id|.
+  // Creates and shows a widget. See ash/public/cpp/shell_window_ids.h for
+  // values for |container_id|.
   static std::unique_ptr<views::Widget> CreateTestWidget(
       const gfx::Rect& bounds,
       views::WidgetDelegate* delegate = nullptr,
       int container_id = kShellWindowId_DefaultContainer);
 
   // Returns the Display for the secondary display. It's assumed there are two
   // displays.
   display::Display GetSecondaryDisplay();
 
   // Sets the placement of the secondary display. Returns true if the secondary
@@ skipping 24 matching lines @@
 
  private:
   std::unique_ptr<AshTestImpl> test_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTest);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_TEST_ASH_TEST_H_