Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

examples/ui/tile/tile_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.
 
 #include "base/strings/string_split.h"
 #include "examples/ui/tile/tile_app.h"
 #include "examples/ui/tile/tile_view.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "url/url_parse.h"
 
@@ skipping 24 matching lines @@
   url::Component query = parsed.query;
 
   for (;;) {
     url::Component key, value;
     if (!url::ExtractQueryKeyValue(connection_url.c_str(), &query, &key,
                                    &value))
       break;
     std::string key_str(connection_url, key.begin, key.len);
     std::string value_str(connection_url, value.begin, value.len);
     if (key_str == "views") {
-      base::SplitString(value_str, ',', &params->view_urls);
+      params->view_urls = base::SplitString(
+          value_str, ",", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     } else if (key_str == "vm") {
       if (value_str == "any")
         params->version_mode = TileParams::VersionMode::kAny;
       else if (value_str == "exact")
         params->version_mode = TileParams::VersionMode::kExact;
       else
         return false;
     } else if (key_str == "cm") {
       if (value_str == "merge")
         params->combinator_mode = TileParams::CombinatorMode::kMerge;
@@ skipping 14 matching lines @@
         return false;
     } else {
       return false;
     }
   }
 
   return !params->view_urls.empty();
 }
 
 }  // namespace examples