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

services/contacts/contacts_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/run_loop.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/contacts/public/interfaces/contacts.mojom.h"
+#include "mojo/services/contacts/interfaces/contacts.mojom.h"
 
 namespace contacts {
 
 class ContactAppTest : public mojo::test::ApplicationTestBase {
  public:
   ContactAppTest() : ApplicationTestBase() {}
   ~ContactAppTest() override {}
 
   void SetUp() override {
     mojo::test::ApplicationTestBase::SetUp();
@@ skipping 62 matching lines @@
 
   contacts_service_->GetPhoto(0, true, [&url](const mojo::String& u) {
     url = u;
     base::MessageLoop::current()->QuitWhenIdle();
   });
   { base::RunLoop().Run(); };
   EXPECT_TRUE(url.is_null());
 }
 
 }  // namespace contacts