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

chrome/browser/ui/ash/system_tray_client.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 "chrome/browser/ui/ash/system_tray_client.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
-#include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_shell.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/system/system_clock.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 233 matching lines @@
     connector->ConnectToInterface("service:content_browser", &system_tray_);
 
   // Tolerate ash crashing and coming back up.
   system_tray_.set_connection_error_handler(base::Bind(
       &SystemTrayClient::OnClientConnectionError, base::Unretained(this)));
 }
 
 void SystemTrayClient::OnClientConnectionError() {
   system_tray_.reset();
 }