Revert of Perform InterfaceProviderSpec intersection in the ServiceManager

services/service_manager/connect_params.h

 // Copyright 2015 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_SERVICE_MANAGER_CONNECT_PARAMS_H_
 #define SERVICES_SERVICE_MANAGER_CONNECT_PARAMS_H_
 
 #include <string>
 #include <utility>
 
@@ skipping 34 matching lines @@
   bool HasClientProcessInfo() const {
     return service_.is_bound() && pid_receiver_request_.is_pending();
   }
   mojom::ServicePtr TakeService() {
     return std::move(service_);
   }
   mojom::PIDReceiverRequest TakePIDReceiverRequest() {
     return std::move(pid_receiver_request_);
   }
 
-  void set_interface_request_info(
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle interface_pipe) {
-    interface_name_ = interface_name;
-    interface_pipe_ = std::move(interface_pipe);
-  }
-  const std::string& interface_name() const {
-    return interface_name_;
-  }
-  bool HasInterfaceRequestInfo() const {
-    return !interface_name_.empty() && interface_pipe_.is_valid();
-  }
-  mojo::ScopedMessagePipeHandle TakeInterfaceRequestPipe() {
-    return std::move(interface_pipe_);
-  }
-
   void set_connect_callback(const mojom::Connector::ConnectCallback& value) {
     connect_callback_ = value;
   }
   const mojom::Connector::ConnectCallback& connect_callback() const {
     return connect_callback_;
   }
 
-  void set_bind_interface_callback(
-      const mojom::Connector::BindInterfaceCallback& callback) {
-    bind_interface_callback_ = callback;
-  }
-  const mojom::Connector::BindInterfaceCallback&
-      bind_interface_callback() const {
-    return bind_interface_callback_;
-  }
-
  private:
   // It may be null (i.e., is_null() returns true) which indicates that there is
   // no source (e.g., for the first application or in tests).
   Identity source_;
   // The identity of the application being connected to.
   Identity target_;
 
   mojom::InterfaceProviderRequest remote_interfaces_;
   mojom::ServicePtr service_;
   mojom::PIDReceiverRequest pid_receiver_request_;
-  std::string interface_name_;
-  mojo::ScopedMessagePipeHandle interface_pipe_;
   mojom::Connector::ConnectCallback connect_callback_;
-  mojom::Connector::BindInterfaceCallback bind_interface_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectParams);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_CONNECT_PARAMS_H_