Fix an issue running mash in chrome:

services/shell/public/cpp/interface_registry.h

 // 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.
 
 #ifndef SERVICES_SHELL_PUBLIC_CPP_INTERFACE_REGISTRY_H_
 #define SERVICES_SHELL_PUBLIC_CPP_INTERFACE_REGISTRY_H_
 
 #include <memory>
 #include <queue>
 #include <set>
@@ skipping 63 matching lines @@
    private:
     InterfaceRegistry* registry_;
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
   // Construct an InterfaceRegistry with no filtering rules applied.
   InterfaceRegistry();
 
   // Construct an InterfaceRegistry with filtering rules as specified in
   // |capability_request| applied.
-  InterfaceRegistry(const Identity& remote_identity,
+  InterfaceRegistry(const Identity& local_identity,
+                    const Identity& remote_identity,
                     const CapabilityRequest& capability_request);
   ~InterfaceRegistry() override;
 
   // Sets a default handler for incoming interface requests which are allowed by
   // capability filters but have no registered handler in this registry.
   void set_default_binder(const Binder& binder) { default_binder_ = binder; }
 
   void Bind(mojom::InterfaceProviderRequest local_interfaces_request);
 
   base::WeakPtr<InterfaceRegistry> GetWeakPtr();
@@ skipping 60 matching lines @@
   bool SetInterfaceBinderForName(std::unique_ptr<InterfaceBinder> binder,
                                  const std::string& name);
 
   // Returns true if |remote_identity_| is allowed to bind |interface_name|,
   // according to capability policy.
   bool CanBindRequestForInterface(const std::string& interface_name) const;
 
   mojom::InterfaceProviderRequest pending_request_;
 
   mojo::Binding<mojom::InterfaceProvider> binding_;
+  const Identity local_identity_;
   const Identity remote_identity_;
   const CapabilityRequest capability_request_;
   const bool allow_all_interfaces_;
 
   NameToInterfaceBinderMap name_to_binder_;
   Binder default_binder_;
 
   bool is_paused_ = false;
 
   // Pending interface requests which can accumulate if GetInterface() is called
   // while binding is paused.
   std::queue<std::pair<std::string, mojo::ScopedMessagePipeHandle>>
       pending_interface_requests_;
 
   base::WeakPtrFactory<InterfaceRegistry> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfaceRegistry);
 };
 
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_INTERFACE_REGISTRY_H_