Move //mojo/services tracing & catalog to //services

services/shell/tests/loader_unittest.cc

 // Copyright 2014 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 <utility>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/catalog/factory.h"
-#include "mojo/services/catalog/store.h"
+#include "services/catalog/factory.h"
+#include "services/catalog/store.h"
 #include "services/shell/connect_util.h"
 #include "services/shell/loader.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/cpp/shell_connection.h"
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
 #include "services/shell/shell.h"
 #include "services/shell/tests/test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 526 matching lines @@
   EXPECT_EQ(2, test_loader_->num_loads());
 
   // A different identity because the domain is different.
   ConnectToInterface("test:bar", &test_service);
   EXPECT_EQ(3, test_loader_->num_loads());
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo