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

services/catalog/factory.h

 // Copyright 2016 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_SERVICES_CATALOG_FACTORY_H_
-#define MOJO_SERVICES_CATALOG_FACTORY_H_
+#ifndef SERVICES_CATALOG_FACTORY_H_
+#define SERVICES_CATALOG_FACTORY_H_
 
 #include <map>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
-#include "mojo/services/catalog/public/interfaces/resolver.mojom.h"
-#include "mojo/services/catalog/types.h"
+#include "services/catalog/public/interfaces/catalog.mojom.h"
+#include "services/catalog/public/interfaces/resolver.mojom.h"
+#include "services/catalog/types.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/interfaces/shell_client.mojom.h"
 #include "services/shell/public/interfaces/shell_resolver.mojom.h"
 
 namespace base {
 class TaskRunner;
 }
 
 namespace mojo{
 class ShellConnection;
@@ skipping 50 matching lines @@
 
   EntryCache system_catalog_;
 
   base::WeakPtrFactory<Factory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Factory);
 };
 
 }  // namespace catalog
 
-#endif  // MOJO_SERVICES_CATALOG_FACTORY_H_
+#endif  // SERVICES_CATALOG_FACTORY_H_