Mojo: Move mojo/public/shell to mojo/public/{cpp,interfaces}/shell.

mojo/service_manager/service_manager.h

 // Copyright 2013 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 MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_
 #define MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
-#include "mojo/public/shell/shell.mojom.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/service_manager/service_manager_export.h"
 #include "url/gurl.h"
 
 namespace content {
   class MojoTest;
 }
 
 namespace mojo {
 
 class ServiceLoader;
@@ skipping 54 matching lines @@
   SchemeToLoaderMap scheme_to_loader_;
   ServiceLoader* default_loader_;
 
   URLToServiceFactoryMap url_to_service_factory_;
   DISALLOW_COPY_AND_ASSIGN(ServiceManager);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_