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

services/catalog/entry_unittest.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/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "services/shell/public/cpp/capabilities.h"
 #include "services/shell/public/cpp/names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 12 matching lines @@
     CHECK(value->GetAsDictionary(&dictionary));
     if (out_value)
       *out_value = std::move(value);
     return Entry::Deserialize(*dictionary);
   }
 
   scoped_ptr<base::Value> ReadManifest(const std::string& manifest) {
     base::FilePath manifest_path;
     PathService::Get(base::DIR_SOURCE_ROOT, &manifest_path);
     manifest_path = manifest_path.AppendASCII(
-        "mojo/services/catalog/data/" + manifest);
+        "services/catalog/data/" + manifest);
 
     JSONFileValueDeserializer deserializer(manifest_path);
     int error = 0;
     std::string message;
     // TODO(beng): probably want to do more detailed error checking. This should
     //             be done when figuring out if to unblock connection
     //             completion.
     return deserializer.Deserialize(&error, &message);
   }
 
@@ skipping 44 matching lines @@
   EXPECT_EQ(*entry, *reconstituted);
 }
 
 TEST_F(EntryTest, Malformed) {
   scoped_ptr<base::Value> value = ReadManifest("malformed");
   EXPECT_FALSE(value.get());
 }
 
 
 }  // namespace catalog