Moves manifest parsing to a new class, Reader.

mojo/shell/public/cpp/lib/capabilities.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/shell/public/cpp/capabilities.h"
 
 namespace mojo {
 
 CapabilityRequest::CapabilityRequest() {}
 CapabilityRequest::~CapabilityRequest() {}
 
 bool CapabilityRequest::operator==(const CapabilityRequest& other) const {
   return other.classes == classes && other.interfaces == interfaces;
 }
 
+bool CapabilityRequest::operator<(const CapabilityRequest& other) const {
+  return std::tie(classes, interfaces) <
+      std::tie(other.classes, other.interfaces);
+}
+
 CapabilitySpec::CapabilitySpec() {}
 CapabilitySpec::~CapabilitySpec() {}
 
 bool CapabilitySpec::operator==(const CapabilitySpec& other) const {
   return other.provided == provided && other.required == required;
 }
 
+bool CapabilitySpec::operator<(const CapabilitySpec& other) const {
+  return std::tie(provided, required) <
+      std::tie(other.provided, other.required);
+}
+
 // static
 shell::mojom::CapabilitySpecPtr
 TypeConverter<shell::mojom::CapabilitySpecPtr, CapabilitySpec>::Convert(
     const CapabilitySpec& input) {
   shell::mojom::CapabilitySpecPtr spec(shell::mojom::CapabilitySpec::New());
   spec->provided =
       mojo::Map<mojo::String, mojo::Array<mojo::String>>::From(input.provided);
   spec->required =
       mojo::Map<mojo::String, shell::mojom::CapabilityRequestPtr>::From(
           input.required);
@@ skipping 28 matching lines @@
 TypeConverter<CapabilityRequest,
               shell::mojom::CapabilityRequestPtr>::Convert(
     const shell::mojom::CapabilityRequestPtr& input) {
   CapabilityRequest request;
   request.classes = input->classes.To<std::set<std::string>>();
   request.interfaces = input->interfaces.To<std::set<std::string>>();
   return request;
 }
 
 }  // namespace mojo