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

apps/moterm/moterm_main.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.
 
 // This is the "main" for the embeddable Moterm terminal view, which provides
 // services to the thing embedding it. (This is not very useful as a "top-level"
 // application.)
 
 #include "apps/moterm/moterm_view.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.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/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_client_factory.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
 
 namespace {
 
 class Moterm : public mojo::ApplicationDelegate,
                public mojo::ViewManagerDelegate {
  public:
   Moterm() : application_impl_() {}
   ~Moterm() override {}
 
  private:
@@ skipping 26 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(Moterm);
 };
 
 }  // namespace
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new Moterm());
   return runner.Run(application_request);
 }