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

chrome/browser/chromeos/display/overscan_calibrator.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 "chrome/browser/chromeos/display/overscan_calibrator.h"
 
 #include <stdint.h>
 
 #include <limits>
 
-#include "ash/common/shell_window_ids.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/gfx/canvas.h"
 
@@ skipping 128 matching lines @@
     const gfx::Rect& damage_rect_in_dip) {
 }
 
 void OverscanCalibrator::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
   // TODO(mukai): Cancel the overscan calibration when the device
   // configuration has changed.
 }
 
 }  // namespace chromeos