Revert of Move JoinString to the base namespace

cloud_print/virtual_driver/win/install/setup.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 <windows.h>
 #include <setupapi.h>  // Must be included after windows.h
 #include <winspool.h>
 #include <iomanip>
 
 #include "base/at_exit.h"
@@ skipping 265 matching lines @@
   // Set up supported print system version.  Must be 3.
   driver_info.cVersion = 3;
 
   // None of the print API structures likes constant strings even though they
   // don't modify the string.  const_casting is the cleanest option.
   driver_info.pDataFile = const_cast<LPWSTR>(data_file.value().c_str());
   driver_info.pHelpFile = const_cast<LPWSTR>(ui_help_path.value().c_str());
   driver_info.pDriverPath = const_cast<LPWSTR>(xps_path.value().c_str());
   driver_info.pConfigFile = const_cast<LPWSTR>(ui_path.value().c_str());
 
-  base::string16 dependent_files(base::JoinString(dependent_array, L"\n"));
+  base::string16 dependent_files(JoinString(dependent_array, L'\n'));
   dependent_files.push_back(L'\n');
   std::replace(dependent_files.begin(), dependent_files.end(), L'\n', L'\0');
   driver_info.pDependentFiles = &dependent_files[0];
 
   // Set up user visible strings.
   base::string16 manufacturer = LoadLocalString(IDS_GOOGLE);
   driver_info.pszMfgName = const_cast<LPWSTR>(manufacturer.c_str());
   driver_info.pszProvider = const_cast<LPWSTR>(manufacturer.c_str());
   driver_info.pszOEMUrl = const_cast<LPWSTR>(kGcpUrl);
   driver_info.dwlDriverVersion = GetVersionNumber();
@@ skipping 253 matching lines @@
 
   VLOG(0) << GetErrorMessage(retval)
           << " HRESULT=0x" << std::setbase(16) << retval;
 
   // Installer is silent by default as required by Google Update.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch("verbose")) {
     DisplayWindowsMessage(NULL, retval, LoadLocalString(IDS_DRIVER_NAME));
   }
   return retval;
 }