Make CapabilityFilter be part of Identity

mojo/shell/connect_to_application_params.cc

 // 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.
 
 #include "mojo/shell/connect_to_application_params.h"
 
 #include "mojo/shell/application_instance.h"
 
 namespace mojo {
 namespace shell {
 
 ConnectToApplicationParams::ConnectToApplicationParams() {}
 
 ConnectToApplicationParams::~ConnectToApplicationParams() {}
 
-void ConnectToApplicationParams::SetOriginatorInfo(
-    ApplicationInstance* originator) {
-  if (!originator) {
-    originator_identity_ = Identity();
-    originator_filter_.clear();
+void ConnectToApplicationParams::SetSource(ApplicationInstance* source) {
+  if (!source) {
+    source_ = Identity();
     return;
   }
 
-  originator_identity_ = originator->identity();
-  originator_filter_ = originator->filter();
+  source_ = source->identity();
 }
 
-void ConnectToApplicationParams::SetURLInfo(const GURL& app_url) {
-  app_url_ = app_url;
-  app_url_request_ = URLRequest::New();
-  app_url_request_->url = app_url_.spec();
+void ConnectToApplicationParams::SetTarget(const Identity& target) {
+  target_ = target;
+  target_url_request_ = URLRequest::New();
+  target_url_request_->url = target_.url.spec();
 }
 
-void ConnectToApplicationParams::SetURLInfo(URLRequestPtr app_url_request) {
-  app_url_request_ = app_url_request.Pass();
-  app_url_ = app_url_request_ ? GURL(app_url_request_->url) : GURL();
+void ConnectToApplicationParams::SetTargetURL(const GURL& target_url) {

[yzshen1, 2015/09/18 06:07:54]

Related to my comment in identity.h: does it make sense to use reject-all as the
default filter?

[yzshen1, 2015/09/18 15:44:09]

Please ignore this comment. I somehow misread the code. Here target_.filter() is
used so it shouldn't be an issue.

+  target_ = Identity(target_url, target_.qualifier, target_.filter());
+  target_url_request_ = URLRequest::New();
+  target_url_request_->url = target_.url.spec();
+}
+
+void ConnectToApplicationParams::SetTargetURLRequest(URLRequestPtr request) {

[yzshen1, 2015/09/18 06:07:54]

It seems we have a few copies of target's contents: (part of) target_ -> target
-> target_. It would be nice to avoid some of those.

+  Identity target = request ? Identity(GURL(request->url), target_.qualifier,
+                                       target_.filter())
+                            : Identity();
+  SetTargetURLRequest(request.Pass(), target);
+}
+
+void ConnectToApplicationParams::SetTargetURLRequest(URLRequestPtr request,
+                                                     const Identity& target) {
+  target_url_request_ = request.Pass();
+  target_ = target;
 }
 
 }  // namespace shell
 }  // namespace mojo