Revert of Update SplitString calls to new form

google_apis/gaia/gaia_auth_util.cc

 // Copyright (c) 2012 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 "google_apis/gaia/gaia_auth_util.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "url/gurl.h"
 
 namespace gaia {
 
 namespace {
 
 const char kGmailDomain[] = "gmail.com";
 const char kGooglemailDomain[] = "googlemail.com";
 
 std::string CanonicalizeEmailImpl(const std::string& email_address,
                                   bool change_googlemail_to_gmail) {
-  std::vector<std::string> parts = base::SplitString(
-      email_address, "@", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<std::string> parts;
+  char at = '@';
+  base::SplitString(email_address, at, &parts);
   if (parts.size() != 2U) {
     NOTREACHED() << "expecting exactly one @, but got "
                  << (parts.empty() ? 0 : parts.size() - 1)
                  << " : " << email_address;
   } else {
     if (change_googlemail_to_gmail && parts[1] == kGooglemailDomain)
       parts[1] = kGmailDomain;
 
     if (parts[1] == kGmailDomain)  // only strip '.' for gmail accounts.
       base::RemoveChars(parts[0], ".", &parts[0]);
@@ skipping 120 matching lines @@
           accounts->push_back(listed_account);
         }
       }
     }
   }
 
   return true;
 }
 
 }  // namespace gaia