Eliminate CapabilityFilter parameter from CreateInstance, instead reading it from the associated ma…

mojo/shell/tests/lifecycle/lifecycle_unittest.cc

 // 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.
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 185 matching lines @@
     // Generate a token for the child to find and connect to a primordial pipe
     // and pass that as well.
     std::string primordial_pipe_token = mojo::edk::GenerateRandomToken();
     child_command_line.AppendSwitchASCII(switches::kPrimordialPipeToken,
                                          primordial_pipe_token);
 
     // Allocate the pipe locally.
     mojo::ScopedMessagePipeHandle pipe =
         mojo::edk::CreateParentMessagePipe(primordial_pipe_token);
 
-    mojo::shell::mojom::CapabilityFilterPtr filter(
-        mojo::shell::mojom::CapabilityFilter::New());
-    mojo::Array<mojo::String> test_interfaces;
-    test_interfaces.push_back("*");
-    filter->filter.insert("*", std::move(test_interfaces));
-
     mojo::shell::mojom::ShellPtr shell;
     connector()->ConnectToInterface("mojo:shell", &shell);
 
     mojo::shell::mojom::ShellClientFactoryPtr factory;
     factory.Bind(mojo::InterfacePtrInfo<mojo::shell::mojom::ShellClientFactory>(
         std::move(pipe), 0u));
     base::RunLoop loop;
-    mojo::shell::mojom::IdentityPtr target(mojo::shell::mojom::Identity::New());
-    target->name = kTestExeName;
-    target->user_id = mojom::kInheritUserID;
-    target->instance = "";
-    shell->CreateInstance(std::move(factory), std::move(target),
-                          std::move(filter), std::move(request),
+    mojo::Identity target(kTestExeName, mojom::kInheritUserID);
+    shell->CreateInstance(std::move(factory),
+                          mojo::shell::mojom::Identity::From(target),
+                          std::move(request),
                           base::Bind(&LifecycleTest::OnConnectionCompleted,
                                      base::Unretained(this), &loop));
     loop.Run();
 
     base::LaunchOptions options;
   #if defined(OS_WIN)
     options.handles_to_inherit = &handle_passing_info;
   #elif defined(OS_POSIX)
     options.fds_to_remap = &handle_passing_info;
   #endif
@@ skipping 273 matching lines @@
   loop.Run();
 
   WaitForInstanceDestruction();
   EXPECT_FALSE(instances()->HasInstanceForName(kTestExeName));
   EXPECT_EQ(0u, instances()->GetNewInstanceCount());
 }
 
 
 }  // namespace shell
 }  // namespace mojo