Make aura work with mus

ui/aura/mus/surface_id_handler.h

Index: ui/aura/mus/surface_id_handler.h
diff --git a/services/ui/public/cpp/surface_id_handler.h b/ui/aura/mus/surface_id_handler.h
similarity index 86%
copy from services/ui/public/cpp/surface_id_handler.h
copy to ui/aura/mus/surface_id_handler.h
index 77bacfd1396d05edbd5bba59b577e0ebb1ef6e0f..9996119de51ed2f93e4fb6574a768d0c898da543 100644
--- a/services/ui/public/cpp/surface_id_handler.h
+++ b/ui/aura/mus/surface_id_handler.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_PUBLIC_CPP_SURFACE_ID_HANDLER_H_
-#define SERVICES_UI_PUBLIC_CPP_SURFACE_ID_HANDLER_H_
+#ifndef UI_AURA_MUS_SURFACE_ID_HANDLER_H_
+#define UI_AURA_MUS_SURFACE_ID_HANDLER_H_
 
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "ui/gfx/geometry/size.h"
 
-namespace ui {
+namespace aura {
 
 class Window;
 
@@ -39,6 +39,6 @@ class SurfaceIdHandler {
       std::unique_ptr<SurfaceInfo>* surface_info) = 0;
 };
 
-}  // namespace ui
+}  // namespace aura
 
-#endif  // SERVICES_UI_PUBLIC_CPP_SURFACE_ID_HANDLER_H_
+#endif  // UI_AURA_MUS_SURFACE_ID_HANDLER_H_