Remove CapabilityFilter from Connect()

mojo/shell/identity.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/identity.h"
 
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 namespace shell {
@@ skipping 16 matching lines @@
 
 }  // namespace
 
 Identity::Identity() {}
 
 Identity::Identity(const GURL& url)
     : Identity(url, url.spec(), mojom::Connector::kUserRoot) {}
 
 Identity::Identity(const GURL& url, const std::string& qualifier,
                    uint32_t user_id)
-    : Identity(url, qualifier, user_id, CapabilityFilter()) {}
-
-Identity::Identity(const GURL& url, const std::string& qualifier,
-                   uint32_t user_id, CapabilityFilter filter)
     : url_(url),
       qualifier_(qualifier.empty() ? url_.spec() : qualifier),
-      user_id_(user_id),
-      filter_(CanonicalizeFilter(filter)) {}
+      user_id_(user_id) {}
 
 Identity::~Identity() {}
 
 bool Identity::operator<(const Identity& other) const {
   // We specifically don't include filter in the equivalence check because we
   // don't quite know how this should work yet.
   // TODO(beng): figure out how it should work.
   if (url_ != other.url_)
     return url_ < other.url_;
   if (qualifier_ != other.qualifier_)
     return qualifier_ < other.qualifier_;
   return user_id_ < other.user_id_;
 }
 
 bool Identity::operator==(const Identity& other) const {
+  // We specifically don't include filter in the equivalence check because we
+  // don't quite know how this should work yet.
+  // TODO(beng): figure out how it should work.
   return other.url_ == url_ && other.qualifier_ == qualifier_ &&
-    other.filter_ == filter_ && other.user_id_ == user_id_;
+         other.user_id_ == user_id_;
+}
+
+void Identity::SetFilter(const CapabilityFilter& filter) {
+  filter_ = CanonicalizeFilter(filter);
 }
 
 Identity CreateShellIdentity() {
-  return Identity(GURL("mojo://shell/"), std::string(),
-                  mojom::Connector::kUserRoot, GetPermissiveCapabilityFilter());
+  Identity id =
+      Identity(GURL("mojo://shell/"), "", mojom::Connector::kUserRoot);
+  id.SetFilter(GetPermissiveCapabilityFilter());
+  return id;
 }
 
 }  // namespace shell
 }  // namespace mojo