Convert ConnectToApplication to take a params class

mojo/application/public/cpp/application_impl.h

 // Copyright 2014 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 MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
 #define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/lib/service_registry.h"
 #include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
@@ skipping 30 matching lines @@
 //
 // ApplicationImpl app(service_provider_handle);
 // app.AddService<FooImpl>();
 //
 // BarContext context;
 // app.AddService<BarImpl>(&context);
 //
 //
 class ApplicationImpl : public Application {
  public:
+  class ConnectParams {
+   public:
+    explicit ConnectParams(const std::string& url);
+    explicit ConnectParams(URLRequestPtr request);
+    ~ConnectParams();
+
+    URLRequestPtr TakeRequest() { return request_.Pass(); }
+    CapabilityFilterPtr TakeFilter() { return filter_.Pass(); }
+    void set_filter(CapabilityFilterPtr filter) {
+      filter_ = filter.Pass();
+    }
+
+   private:
+    URLRequestPtr request_;
+    CapabilityFilterPtr filter_;
+
+    DISALLOW_COPY_AND_ASSIGN(ConnectParams);
+  };
+
   class TestApi {
    public:
     explicit TestApi(ApplicationImpl* application)
         : application_(application) {}
 
     void UnbindConnections(InterfaceRequest<Application>* application_request,
                            ShellPtr* shell) {
       application_->UnbindConnections(application_request, shell);
     }
 
@@ skipping 20 matching lines @@
 
   const std::string& url() const { return url_; }
 
   AppLifetimeHelper* app_lifetime_helper() { return &app_lifetime_helper_; }
 
   // Requests a new connection to an application. Returns a pointer to the
   // connection if the connection is permitted by this application's delegate,
   // or nullptr otherwise. Caller takes ownership.
   scoped_ptr<ApplicationConnection> ConnectToApplication(
       const std::string& url);
-  scoped_ptr<ApplicationConnection> ConnectToApplication(URLRequestPtr request);
-  scoped_ptr<ApplicationConnection> ConnectToApplicationWithCapabilityFilter(
-      URLRequestPtr request,
-      CapabilityFilterPtr filter);
+  scoped_ptr<ApplicationConnection> ConnectToApplication(ConnectParams* params);
 
   // Connect to application identified by |request->url| and connect to the
   // service implementation of the interface identified by |Interface|.
   template <typename Interface>
-  void ConnectToService(mojo::URLRequestPtr request,
-                        InterfacePtr<Interface>* ptr) {
-    scoped_ptr<ApplicationConnection> connection =
-        ConnectToApplication(request.Pass());
+  void ConnectToService(ConnectParams* params, InterfacePtr<Interface>* ptr) {
+    scoped_ptr<ApplicationConnection> connection = ConnectToApplication(params);
     if (!connection.get())
       return;
     connection->ConnectToService(ptr);
   }
+  template <typename Interface>
+  void ConnectToService(const std::string& url, InterfacePtr<Interface>* ptr) {
+    ConnectParams params(url);
+    return ConnectToService(&params, ptr);
+  }
 
   // Block the calling thread until the Initialize() method is called by the
   // shell.
   void WaitForInitialize();
 
   // Initiate shutdown of this application. This may involve a round trip to the
   // Shell to ensure there are no inbound service requests.
   void Quit();
 
  private:
@@ skipping 29 matching lines @@
   AppLifetimeHelper app_lifetime_helper_;
   bool quit_requested_;
   base::WeakPtrFactory<ApplicationImpl> weak_factory_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_