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

ash/common/metrics/pointer_metrics_recorder_unittest.cc

 // 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.
 
 #include "ash/common/metrics/pointer_metrics_recorder.h"
 
-#include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shared/app_types.h"
 #include "ash/test/ash_test_base.h"
 #include "base/test/histogram_tester.h"
 #include "ui/events/event.h"
 #include "ui/views/pointer_watcher.h"
 #include "ui/views/widget/widget.h"
 
 using views::PointerWatcher;
 
 namespace ash {
@@ skipping 160 matching lines @@
                                                     target.get());
   histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 3, 1);
 
   window->SetAppType(static_cast<int>(AppType::DEFAULT_NOTE_TAKING_APP));
   pointer_metrics_recorder_->OnPointerEventObserved(pointer_event, gfx::Point(),
                                                     target.get());
   histogram_tester_->ExpectBucketCount(kDestinationHistogramName, 4, 1);
 }
 
 }  // namespace ash