Removing incorrect usage of TO_L_STRING() macros.

remoting/host/host_service_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/host_service_win.h"
 
 #include <windows.h>
 #include <wtsapi32.h>
 #include <stdio.h>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/stringize_macros.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
+#include "base/utf_string_conversions.h"
 #include "base/win/wrapped_window_proc.h"
 #include "remoting/base/breakpad.h"
 #include "remoting/base/scoped_sc_handle_win.h"
 #include "remoting/host/branding.h"
 #include "remoting/host/host_service_resource.h"
 #include "remoting/host/usage_stats_consent.h"
 #include "remoting/host/wts_console_observer_win.h"
 #include "remoting/host/wts_session_process_launcher_win.h"
 
 using base::StringPrintf;
 
 namespace {
 
 // Session id that does not represent any session.
 const uint32 kInvalidSession = 0xffffffff;
 
 const char kIoThreadName[] = "I/O thread";
 
 // A window class for the session change notifications window.
-const char16 kSessionNotificationWindowClass[] =
-  TO_L_STRING("Chromoting_SessionNotificationWindow");
+const wchar_t kSessionNotificationWindowClass[] =
+  L"Chromoting_SessionNotificationWindow";
 
 // Command line actions and switches:
 // "run" sumply runs the service as usual.
-const char16 kRunActionName[] = TO_L_STRING("run");
+const wchar_t kRunActionName[] = L"run";
 
 // "--console" runs the service interactively for debugging purposes.
 const char kConsoleSwitchName[] = "console";
 
 // "--host-binary" specifies the host binary to run in console session.
 const char kHostBinarySwitchName[] = "host-binary";
 
 // "--help" or "--?" prints the usage message.
 const char kHelpSwitchName[] = "help";
 const char kQuestionSwitchName[] = "?";
@@ skipping 191 matching lines @@
   if (!SetConsoleCtrlHandler(&HostService::ConsoleControlHandler, TRUE)) {
     LOG_GETLASTERROR(ERROR)
         << "Failed to set console control handler";
     return result;
   }
 
   // Create a window for receiving session change notifications.
   HWND window = NULL;
   WNDCLASSEX window_class;
   base::win::InitializeWindowClass(
-      kSessionNotificationWindowClass,
+      WideToUTF16(kSessionNotificationWindowClass).c_str(),
       &base::win::WrappedWindowProc<SessionChangeNotificationProc>,
       0, 0, 0, NULL, NULL, NULL, NULL, NULL,
       &window_class);
   HINSTANCE instance = window_class.hInstance;
   ATOM atom = RegisterClassExW(&window_class);
   if (atom == 0) {
     LOG_GETLASTERROR(ERROR)
         << "Failed to register the window class '"
         << kSessionNotificationWindowClass << "'";
     goto cleanup;
@@ skipping 167 matching lines @@
   }
 
   remoting::HostService* service = remoting::HostService::GetInstance();
   if (!service->InitWithCommandLine(command_line)) {
     usage(argv[0]);
     return kUsageExitCode;
   }
 
   return service->Run();
 }