Removing incorrect usage of TO_L_STRING() macros.

remoting/host/elevated_controller_win.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 "remoting/host/elevated_controller_win.h"
 
 #include <sddl.h>
 
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/stringize_macros.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/win/scoped_handle.h"
 #include "remoting/host/branding.h"
 #include "remoting/host/elevated_controller_resource.h"
 #include "remoting/host/verify_config_window_win.h"
 
 namespace {
 
 // The maximum size of the configuration file. "1MB ought to be enough" for any
 // reasonable configuration we will ever need. 1MB is low enough to make
 // the probability of out of memory situation fairly low. OOM is still possible
 // and we will crash if it occurs.
 const size_t kMaxConfigFileSize = 1024 * 1024;
 
 // The host configuration file name.
 const FilePath::CharType kConfigFileName[] = FILE_PATH_LITERAL("host.json");
 
 // The unprivileged configuration file name.
 const FilePath::CharType kUnprivilegedConfigFileName[] =
     FILE_PATH_LITERAL("host_unprivileged.json");
 
 // The extension for the temporary file.
 const FilePath::CharType kTempFileExtension[] = FILE_PATH_LITERAL("json~");
 
 // The host configuration file security descriptor that enables full access to
 // Local System and built-in administrators only.
-const char16 kConfigFileSecurityDescriptor[] =
-    TO_L_STRING("O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)");
+const wchar_t kConfigFileSecurityDescriptor[] =
+    L"O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)";
 
-const char16 kUnprivilegedConfigFileSecurityDescriptor[] =
-    TO_L_STRING("O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)(A;;GR;;;AU)");
+const wchar_t kUnprivilegedConfigFileSecurityDescriptor[] =
+    L"O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)(A;;GR;;;AU)";
 
 // Configuration keys.
 const char kHostId[] = "host_id";
 const char kXmppLogin[] = "xmpp_login";
 const char kHostSecretHash[] = "host_secret_hash";
 
 // The configuration keys that cannot be specified in UpdateConfig().
 const char* const kReadonlyKeys[] = { kHostId, kXmppLogin };
 
 // The configuration keys whose values may be read by GetConfig().
@@ skipping 75 matching lines @@
   config_out->reset(dictionary);
   return S_OK;
 }
 
 FilePath GetTempLocationFor(const FilePath& filename) {
   return filename.ReplaceExtension(kTempFileExtension);
 }
 
 // Writes a config file to a temporary location.
 HRESULT WriteConfigFileToTemp(const FilePath& filename,
-                              const char16* security_descriptor,
+                              const wchar_t* security_descriptor,
                               const char* content,
                               size_t length) {
   // Create a security descriptor for the configuration file.
   SECURITY_ATTRIBUTES security_attributes;
   security_attributes.nLength = sizeof(security_attributes);
   security_attributes.bInheritHandle = FALSE;
 
   ULONG security_descriptor_length = 0;
   if (!ConvertStringSecurityDescriptorToSecurityDescriptorW(
            security_descriptor,
@@ skipping 349 matching lines @@
         << "Failed to open to the '" << kWindowsServiceName << "' service";
 
     return HRESULT_FROM_WIN32(error);
   }
 
   service_out->Set(service.Take());
   return S_OK;
 }
 
 } // namespace remoting