Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc

Index: services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
diff --git a/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc b/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
index 5e8e7b753d4f687b41907f6e3e0fa245ed7368f5..5d72314a54edc80ec9f519b4f7f0e848362443d7 100644
--- a/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
+++ b/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
@@ -166,8 +166,9 @@ void MojoUrlRedirectorApplicationTest::HandleRequest(
       http_server::HttpRequestPtr request,
       const mojo::Callback<void(http_server::HttpResponsePtr)>& callback) {
   // The relative url should be of the form "/<platform>/<app>_location".
-  std::vector<std::string> url_components;
-  base::SplitString(request->relative_url, '/', &url_components);
+  std::vector<std::string> url_components =
+      base::SplitString(request->relative_url.get(), "/", base::TRIM_WHITESPACE,
+                        base::SPLIT_WANT_ALL);
   ASSERT_EQ(3u, url_components.size());
   std::string requested_platform = url_components[1];
   EXPECT_TRUE(requested_platform == kPlatform1 ||