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

services/catalog/entry.cc

 // 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.
 
-#include "mojo/services/catalog/entry.h"
+#include "services/catalog/entry.h"
 
 #include "base/values.h"
-#include "mojo/services/catalog/store.h"
 #include "mojo/util/filename_util.h"
+#include "services/catalog/store.h"
 #include "services/shell/public/cpp/names.h"
 #include "url/gurl.h"
 
 namespace catalog {
 namespace {
 
 mojo::CapabilitySpec BuildCapabilitiesV0(
     const base::DictionaryValue& value) {
   mojo::CapabilitySpec capabilities;
   base::DictionaryValue::Iterator it(value);
@@ skipping 209 matching lines @@
   const catalog::Entry& package = input.package() ? *input.package() : input;
   result->resolved_name = package.name();
   result->qualifier = input.qualifier();
   result->capabilities =
       shell::mojom::CapabilitySpec::From(input.capabilities());
   result->package_url = mojo::util::FilePathToFileURL(package.path()).spec();
   return result;
 }
 
 }  // namespace mojo