Revert of Move JoinString to the base namespace

google_apis/gaia/oauth2_mint_token_flow.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/oauth2_mint_token_flow.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 149 matching lines @@
           ? kForceValueTrue : kForceValueFalse;
   const char* response_type_value =
       (parameters_.mode == MODE_MINT_TOKEN_NO_FORCE ||
        parameters_.mode == MODE_MINT_TOKEN_FORCE)
           ? kResponseTypeValueToken : kResponseTypeValueNone;
   std::string body = base::StringPrintf(
       kOAuth2IssueTokenBodyFormat,
       net::EscapeUrlEncodedData(force_value, true).c_str(),
       net::EscapeUrlEncodedData(response_type_value, true).c_str(),
       net::EscapeUrlEncodedData(
-          base::JoinString(parameters_.scopes, " "), true).c_str(),
+          JoinString(parameters_.scopes, ' '), true).c_str(),
       net::EscapeUrlEncodedData(parameters_.client_id, true).c_str(),
       net::EscapeUrlEncodedData(parameters_.extension_id, true).c_str());
   if (!parameters_.device_id.empty()) {
     body.append(base::StringPrintf(
         kOAuth2IssueTokenBodyFormatDeviceIdAddendum,
         net::EscapeUrlEncodedData(parameters_.device_id, true).c_str()));
   }
   return body;
 }
 
@@ skipping 86 matching lines @@
         detail, base::ASCIIToUTF16(kDetailSeparators),
         base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     issue_advice->push_back(entry);
   }
 
   if (!success)
     issue_advice->clear();
 
   return success;
 }