Removing incorrect usage of TO_L_STRING() macros.

remoting/host/wts_session_process_launcher_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.
 //
 // This file implements the Windows service controlling Me2Me host processes
 // running within user sessions.
 
 #include "remoting/host/wts_session_process_launcher_win.h"
 
 #include <windows.h>
 #include <sddl.h>
 #include <limits>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
-#include "base/string16.h"
-#include "base/stringize_macros.h"
 #include "base/stringprintf.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "remoting/host/constants.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/sas_injector.h"
 #include "remoting/host/wts_console_monitor_win.h"
 
 using base::win::ScopedHandle;
 using base::TimeDelta;
 
 namespace {
 
 // The minimum and maximum delays between attempts to inject host process into
 // a session.
 const int kMaxLaunchDelaySeconds = 60;
 const int kMinLaunchDelaySeconds = 1;
 
 // Name of the default session desktop.
-char16 kDefaultDesktopName[] = TO_L_STRING("winsta0\\default");
+wchar_t kDefaultDesktopName[] = L"winsta0\\default";
 
 // Match the pipe name prefix used by Chrome IPC channels.
-const char16 kChromePipeNamePrefix[] = TO_L_STRING("\\\\.\\pipe\\chrome.");
+const wchar_t kChromePipeNamePrefix[] = L"\\\\.\\pipe\\chrome.";
 
 // The IPC channel name is passed to the host in the command line.
 const char kChromotingIpcSwitchName[] = "chromoting-ipc";
 
 // The command line parameters that should be copied from the service's command
 // line to the host process.
 const char* kCopiedSwitchNames[] = {
     "auth-config", "host-config", switches::kV, switches::kVModule };
 
 // The security descriptor of the Chromoting IPC channel. It gives full access
 // to LocalSystem and denies access by anyone else.
-const char16 kChromotingChannelSecurityDescriptor[] =
-    TO_L_STRING("O:SYG:SYD:(A;;GA;;;SY)");
+const wchar_t kChromotingChannelSecurityDescriptor[] =
+    L"O:SYG:SYD:(A;;GA;;;SY)";
 
 // Takes the process token and makes a copy of it. The returned handle will have
 // |desired_access| rights.
 bool CopyProcessToken(DWORD desired_access,
                       ScopedHandle* token_out) {
 
   HANDLE handle;
   if (!OpenProcessToken(GetCurrentProcess(),
                         TOKEN_DUPLICATE | desired_access,
                         &handle)) {
@@ skipping 69 matching lines @@
         "Failed to change session ID of a token";
     return false;
   }
 
   token_out->Set(session_token.Take());
   return true;
 }
 
 // Generates random channel ID.
 // N.B. Stolen from src/content/common/child_process_host_impl.cc
-string16 GenerateRandomChannelId(void* instance) {
-  return base::StringPrintf(TO_L_STRING("%d.%p.%d"),
+std::wstring GenerateRandomChannelId(void* instance) {
+  return base::StringPrintf(L"%d.%p.%d",
                             base::GetCurrentProcId(), instance,
                             base::RandInt(0, std::numeric_limits<int>::max()));
 }
 
 // Creates the server end of the Chromoting IPC channel.
 // N.B. This code is based on IPC::Channel's implementation.
 bool CreatePipeForIpcChannel(void* instance,
-                             string16* channel_name_out,
+                             std::wstring* channel_name_out,
                              ScopedHandle* pipe_out) {
   // Create security descriptor for the channel.
   SECURITY_ATTRIBUTES security_attributes;
   security_attributes.nLength = sizeof(security_attributes);
   security_attributes.bInheritHandle = FALSE;
 
   ULONG security_descriptor_length = 0;
   if (!ConvertStringSecurityDescriptorToSecurityDescriptorW(
            kChromotingChannelSecurityDescriptor,
            SDDL_REVISION_1,
            reinterpret_cast<PSECURITY_DESCRIPTOR*>(
                &security_attributes.lpSecurityDescriptor),
            &security_descriptor_length)) {
     LOG_GETLASTERROR(ERROR) <<
         "Failed to create a security descriptor for the Chromoting IPC channel";
     return false;
   }
 
   // Generate a random channel name.
-  string16 channel_name(GenerateRandomChannelId(instance));
+  std::wstring channel_name(GenerateRandomChannelId(instance));
 
   // Convert it to the pipe name.
-  string16 pipe_name(kChromePipeNamePrefix);
+  std::wstring pipe_name(kChromePipeNamePrefix);
   pipe_name.append(channel_name);
 
   // Create the server end of the pipe. This code should match the code in
   // IPC::Channel with exception of passing a non-default security descriptor.
   HANDLE pipe = CreateNamedPipeW(pipe_name.c_str(),
                                  PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED |
                                      FILE_FLAG_FIRST_PIPE_INSTANCE,
                                  PIPE_TYPE_BYTE | PIPE_READMODE_BYTE,
                                  1,
                                  IPC::Channel::kReadBufferSize,
                                  IPC::Channel::kReadBufferSize,
                                  5000,
                                  &security_attributes);
   if (pipe == INVALID_HANDLE_VALUE) {
     LOG_GETLASTERROR(ERROR) <<
         "Failed to create the server end of the Chromoting IPC channel";
     LocalFree(security_attributes.lpSecurityDescriptor);
     return false;
   }
 
   LocalFree(security_attributes.lpSecurityDescriptor);
 
   *channel_name_out = channel_name;
   pipe_out->Set(pipe);
   return true;
 }
 
 // Launches |binary| in the security context of the supplied |user_token|.
 bool LaunchProcessAsUser(const FilePath& binary,
-                         const string16& command_line,
+                         const std::wstring& command_line,
                          HANDLE user_token,
                          base::Process* process_out) {
-  string16 application_name = binary.value();
+  std::wstring application_name = binary.value();
 
   base::win::ScopedProcessInformation process_info;
   STARTUPINFOW startup_info;
 
   memset(&startup_info, 0, sizeof(startup_info));
   startup_info.cb = sizeof(startup_info);
   startup_info.lpDesktop = kDefaultDesktopName;
 
   if (!CreateProcessAsUserW(user_token,
                             application_name.c_str(),
@@ skipping 46 matching lines @@
 void WtsSessionProcessLauncher::LaunchProcess() {
   DCHECK(main_message_loop_->BelongsToCurrentThread());
   DCHECK(state_ == StateStarting);
   DCHECK(!timer_.IsRunning());
   DCHECK(process_.handle() == NULL);
   DCHECK(process_watcher_.GetWatchedObject() == NULL);
   DCHECK(chromoting_channel_.get() == NULL);
 
   launch_time_ = base::Time::Now();
 
-  string16 channel_name;
+  std::wstring channel_name;
   ScopedHandle pipe;
   if (CreatePipeForIpcChannel(this, &channel_name, &pipe)) {
     // Wrap the pipe into an IPC channel.
     chromoting_channel_.reset(new IPC::ChannelProxy(
         IPC::ChannelHandle(pipe.Get()),
         IPC::Channel::MODE_SERVER,
         this,
         ipc_message_loop_));
 
     // Create the host process command line passing the name of the IPC channel
@@ skipping 193 matching lines @@
       process_watcher_.StopWatching();
       process_.Terminate(0);
       process_.Close();
       chromoting_channel_.reset();
       state_ = StateDetached;
       break;
   }
 }
 
 } // namespace remoting