Support reading multiple InterfaceProviderSpecs from manifests

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"
@@ skipping 59 matching lines @@
 TEST_F(EntryTest, ConnectionSpec) {
   std::unique_ptr<Entry> entry = ReadEntry("connection_spec", nullptr);
 
   EXPECT_EQ("service:foo", entry->name());
   EXPECT_EQ("bar", entry->qualifier());
   EXPECT_EQ("Foo", entry->display_name());
   service_manager::InterfaceProviderSpec spec;
   service_manager::CapabilitySet capabilities;
   capabilities.insert("bar:bar");
   spec.requires["service:bar"] = capabilities;
-  EXPECT_EQ(spec, entry->connection_spec());
+  service_manager::InterfaceProviderSpecMap specs;
+  specs[service_manager::mojom::kServiceManager_ConnectorSpec] = spec;
+  EXPECT_EQ(specs, entry->interface_provider_specs());
 }
 
 TEST_F(EntryTest, Serialization) {
   std::unique_ptr<base::Value> value;
   std::unique_ptr<Entry> entry = ReadEntry("serialization", &value);
 
   std::unique_ptr<base::DictionaryValue> serialized(entry->Serialize());
 
   // We can't just compare values, since during deserialization some of the
   // lists get converted to std::sets, which are sorted, so Value::Equals will
   // fail.
   std::unique_ptr<Entry> reconstituted = Entry::Deserialize(*serialized.get());
   EXPECT_EQ(*entry, *reconstituted);
 }
 
 TEST_F(EntryTest, Malformed) {
   std::unique_ptr<base::Value> value = ReadManifest("malformed");
   EXPECT_FALSE(value.get());
 }
 
 
 }  // namespace catalog