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

services/catalog/factory.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/factory.h"
+#include "services/catalog/factory.h"
 
 #include "base/bind.h"
-#include "mojo/services/catalog/catalog.h"
+#include "services/catalog/catalog.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/shell_connection.h"
 
 namespace catalog {
 
 Factory::Factory(base::TaskRunner* file_task_runner,
                  scoped_ptr<Store> store,
                  ManifestProvider* manifest_provider)
     : file_task_runner_(file_task_runner),
       store_(std::move(store)),
@@ skipping 43 matching lines @@
     return it->second.get();
 
   // TODO(beng): There needs to be a way to load the store from different users.
   Catalog* instance = new Catalog(std::move(store_), file_task_runner_,
                                   &system_catalog_, manifest_provider_);
   catalogs_[user_id] = make_scoped_ptr(instance);
   return instance;
 }
 
 }  // namespace catalog