Revert of Move JoinString to the base namespace

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"
@@ skipping 18 matching lines @@
                  << (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]);
   }
 
-  std::string new_email = base::StringToLowerASCII(
-      base::JoinString(parts, "@"));
+  std::string new_email = base::StringToLowerASCII(JoinString(parts, at));
   VLOG(1) << "Canonicalized " << email_address << " to " << new_email;
   return new_email;
 }
 
 }  // namespace
 
 
 ListedAccount::ListedAccount() {}
 
 ListedAccount::~ListedAccount() {}
@@ skipping 106 matching lines @@
           accounts->push_back(listed_account);
         }
       }
     }
   }
 
   return true;
 }
 
 }  // namespace gaia