Re-land "Flip 'Linux x64' bot on chromium waterfall to GN."

mojo/shell/application_manager_apptest_driver.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 "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 63 matching lines @@
         platform_channel_pair.PassServerHandle();
 
     mojo::ScopedMessagePipeHandle handle(mojo::embedder::CreateChannel(
         platform_channel.Pass(),
         base::Bind(&TargetApplicationDelegate::DidCreateChannel,
                    weak_factory_.GetWeakPtr()),
         base::ThreadTaskRunnerHandle::Get()));
 
     application_manager->CreateInstanceForHandle(
         mojo::ScopedHandle(mojo::Handle(handle.release().value())),
-        "exe:application_manager_apptest_target",
-        "0");
+        "exe:application_manager_apptest_target");
     // Put the other end on the command line used to launch the target.
     platform_channel_pair.PrepareToPassClientHandleToChildProcess(
         &child_command_line, &handle_passing_info);
 
     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 31 matching lines @@
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
 
   mojo::runner::InitializeLogging();
 
   TargetApplicationDelegate delegate;
   return mojo::runner::TestNativeMain(&delegate);
 }