Revert of Update SplitString calls to new form

content/browser/service_worker/service_worker_database.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 "content/browser/service_worker/service_worker_database.h"
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 1196 matching lines @@
     status = LevelDBStatusToStatus(itr->status());
     if (status != STATUS_OK) {
       HandleReadResult(FROM_HERE, status);
       return status;
     }
 
     std::string key;
     if (!RemovePrefix(itr->key().ToString(), kRegKeyPrefix, &key))
       break;
 
-    std::vector<std::string> parts =
-        base::SplitString(key, std::string(1, kKeySeparator),
-                          base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<std::string> parts;
+    base::SplitStringDontTrim(key, kKeySeparator, &parts);
     if (parts.size() != 2) {
       status = STATUS_ERROR_CORRUPTED;
       HandleReadResult(FROM_HERE, status);
       return status;
     }
 
     int64 registration_id;
     status = ParseId(parts[1], &registration_id);
     if (status != STATUS_OK) {
       HandleReadResult(FROM_HERE, status);
@@ skipping 369 matching lines @@
   if (status != STATUS_OK)
     Disable(from_here, status);
   ServiceWorkerMetrics::CountWriteDatabaseResult(status);
 }
 
 bool ServiceWorkerDatabase::IsDatabaseInMemory() const {
   return path_.empty();
 }
 
 }  // namespace content