Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

examples/native_run_app/native_run_app.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.
 
 // This is a terminal client (i.e., a "raw" |mojo.terminal.Terminal| -- e.g.,
 // moterm -- can be asked to talk to this) that prompts the user for a native
 // (Linux) binary to run and then does so (via mojo:native_support).
 //
 // E.g., first run mojo:moterm_example_app (embedded by a window manager). Then,
 // at the prompt, enter "mojo:native_run_app". At the next prompt, enter "bash"
 // (or "echo hello mojo").
 //
 // TODO(vtl): Maybe it should optionally be able to extract the binary path (and
 // args) from the connection URL?
 
 #include <string.h>
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/files/interfaces/files.mojom.h"
 #include "mojo/services/files/interfaces/ioctl.mojom.h"
@@ skipping 53 matching lines @@
   void DidReadFromPrompt(mojo::files::Error error,
                          mojo::Array<uint8_t> bytes_read) {
     if (error != mojo::files::Error::OK || !bytes_read.size()) {
       LOG(ERROR) << "Read() error: " << error;
       delete this;
       return;
     }
 
     std::string input(reinterpret_cast<const char*>(&bytes_read[0]),
                       bytes_read.size());
-    command_line_.clear();
-    base::SplitStringAlongWhitespace(input, &command_line_);
+    // TODO(vtl): Are these arguments really what we want? Probably not.
+    command_line_ =
+        base::SplitString(input, base::kWhitespaceASCII, base::KEEP_WHITESPACE,
+                          base::SPLIT_WANT_NONEMPTY);
 
     if (command_line_.empty()) {
       Start();
       return;
     }
 
     // Set the terminal to noncanonical mode. Do so by getting the settings,
     // flipping the flag, and setting them.
     // TODO(vtl): Should it do other things?
     // TODO(vtl): I wonder if these ioctls shouldn't be done by the
@@ skipping 135 matching lines @@
 
   native_support::ProcessPtr native_support_process_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeRunApp);
 };
 
 MojoResult MojoMain(MojoHandle application_request) {
   NativeRunApp native_run_app;
   return mojo::RunMainApplication(application_request, &native_run_app);
 }