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

examples/keyboard_client/keyboard_client.cc

 // 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.
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/gpu/gl_texture.h"
 #include "mojo/gpu/texture_cache.h"
 #include "mojo/gpu/texture_uploader.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
-#include "mojo/services/keyboard/public/interfaces/keyboard.mojom.h"
+#include "mojo/services/keyboard/interfaces/keyboard.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
 #include "mojo/skia/ganesh_context.h"
 #include "mojo/skia/ganesh_surface.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkTypeface.h"
@@ skipping 366 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardDelegate);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new examples::KeyboardDelegate);
   return runner.Run(application_request);
 }