Move services/shell to services/service_manager

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 "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 "services/service_manager/public/cpp/capabilities.h"
+#include "services/service_manager/public/cpp/names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace catalog {
 
 class EntryTest : public testing::Test {
  public:
   EntryTest() {}
   ~EntryTest() override {}
 
  protected:
@@ skipping 69 matching lines @@
   EXPECT_EQ(*entry, *reconstituted);
 }
 
 TEST_F(EntryTest, Malformed) {
   std::unique_ptr<base::Value> value = ReadManifest("malformed");
   EXPECT_FALSE(value.get());
 }
 
 
 }  // namespace catalog