Revert of Update SplitString calls to new form

content/browser/service_worker/service_worker_browsertest.cc

 // Copyright 2014 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/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 1136 matching lines @@
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, SyncEventInterface) {
   // Verify that the fired sync event has the correct interface.
   // The js event handler will console.log the event properties.
   base::string16 console_output = RunSyncTestWithConsoleOutput(
       "/background_sync/sync_event_interface.js", SERVICE_WORKER_OK);
 
   EXPECT_FALSE(console_output.empty());
 
   // Console output is a pipe-delimited string, as:
   // <event prototype>|<typeof waitUntil>
-  std::vector<base::string16> event_properties =
-      base::SplitString(console_output, base::string16(1, '|'),
-                        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<base::string16> event_properties;
+  base::SplitString(console_output, '|', &event_properties);
 
   const base::string16::size_type num_properties = 2;
   const base::string16 event_type = base::ASCIIToUTF16("SyncEvent");
   const base::string16 wait_until_type = base::ASCIIToUTF16("function");
   EXPECT_EQ(num_properties, event_properties.size());
   EXPECT_EQ(event_type, event_properties[0]);
   EXPECT_EQ(wait_until_type, event_properties[1]);
 }
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
@@ skipping 358 matching lines @@
   ASSERT_EQ(SERVICE_WORKER_OK, status);
   // Stop the worker.
   StopWorker(SERVICE_WORKER_OK);
   // Restart the worker.
   StartWorker(SERVICE_WORKER_OK);
   // Stop the worker.
   StopWorker(SERVICE_WORKER_OK);
 }
 
 }  // namespace content