1 files changed, 3 insertions, 2 deletions
diff --git a/google_apis/gcm/engine/account_mapping.cc b/google_apis/gcm/engine/account_mapping.cc
index db7b3a1..7b0bfb0 100644
--- a/google_apis/gcm/engine/account_mapping.cc
+++ b/google_apis/gcm/engine/account_mapping.cc
@@ -5,6 +5,7 @@
 #include "google_apis/gcm/engine/account_mapping.h"
 
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 
 namespace gcm {
@@ -80,8 +81,8 @@ std::string AccountMapping::SerializeAsString() const {
 }
 
 bool AccountMapping::ParseFromString(const std::string& value) {
-  std::vector<std::string> values;
-  Tokenize(value, kSeparator, &values);
+  std::vector<std::string> values = base::SplitString(
+      value, kSeparator, base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   if (values.size() != kSizeWithNoMessage &&
       values.size() != kSizeWithMessage) {
     return false;