Move //mojo/services/X/public/... to //mojo/services/X/... (part 2).

services/keyboard_native/key_layout.h

 // Copyright 2015 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 SERVICES_KEYBOARD_NATIVE_KEY_LAYOUT_H_
 #define SERVICES_KEYBOARD_NATIVE_KEY_LAYOUT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 class SkCanvas;
 class SkPaint;
 
 namespace gfx {
 class PointF;
 }
 
 namespace keyboard {
@@ skipping 93 matching lines @@
   std::vector<std::vector<Key*>> symbols_key_map_;
   Predictor* predictor_;
   base::WeakPtrFactory<KeyLayout> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyLayout);
 };
 
 }  // namespace keyboard
 
 #endif  // SERVICES_KEYBOARD_NATIVE_KEY_LAYOUT_H_