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

shell/shell_apptest.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 "base/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/http_server/public/cpp/http_server_util.h"
-#include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
-#include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
+#include "mojo/services/http_server/cpp/http_server_util.h"
+#include "mojo/services/http_server/interfaces/http_server.mojom.h"
+#include "mojo/services/http_server/interfaces/http_server_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
 #include "shell/kPingable.h"
 #include "shell/test/pingable.mojom.h"
 
 using mojo::String;
 
 namespace {
 
 std::string GetURL(uint16_t port, const std::string& path) {
   return base::StringPrintf("http://127.0.0.1:%u/%s",
@@ skipping 159 matching lines @@
     EXPECT_TRUE(EndsWith(app_url, "/pingable_app.mojo", true));
     EXPECT_EQ(app_url.To<std::string>() + "?foo", connection_url);
     EXPECT_EQ("hello", message);
     base::MessageLoop::current()->Quit();
   };
   pingable->Ping("hello", callback);
   base::RunLoop().Run();
 }
 
 }  // namespace