Removing incorrect usage of TO_L_STRING() macros.

remoting/host/capturer_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/capturer.h"
 
 #include <windows.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/native_library.h"
-#include "base/string16.h"
-#include "base/stringize_macros.h"
+#include "base/utf_string_conversions.h"
 #include "base/win/scoped_gdi_object.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/host/capturer_helper.h"
 #include "remoting/host/desktop_win.h"
 #include "remoting/host/differ.h"
 #include "remoting/host/scoped_thread_desktop_win.h"
 #include "remoting/proto/control.pb.h"
 
 namespace remoting {
 
 namespace {
 
 // Constants from dwmapi.h.
 const UINT DWM_EC_DISABLECOMPOSITION = 0;
 const UINT DWM_EC_ENABLECOMPOSITION = 1;
 
 typedef HRESULT (WINAPI * DwmEnableCompositionFunc)(UINT);
 
-const char16 kDwmapiLibraryName[] = TO_L_STRING("dwmapi");
+const wchar_t kDwmapiLibraryName[] = L"dwmapi";
 
 // Pixel colors used when generating cursor outlines.
 const uint32 kPixelBgraBlack = 0xff000000;
 const uint32 kPixelBgraWhite = 0xffffffff;
 const uint32 kPixelBgraTransparent = 0x00000000;
 
 // CapturerGdi captures 32bit RGB using GDI.
 //
 // CapturerGdi is double-buffered as required by Capturer. See
 // remoting/host/capturer.h.
@@ skipping 195 matching lines @@
 }
 
 void CapturerGdi::Start(
     const CursorShapeChangedCallback& callback) {
   cursor_shape_changed_callback_ = callback;
 
   // Load dwmapi.dll dynamically since it is not available on XP.
   if (dwmapi_library_ == NULL) {
     std::string error;
     dwmapi_library_ = base::LoadNativeLibrary(
-        FilePath(base::GetNativeLibraryName(kDwmapiLibraryName)), &error);
+        FilePath(base::GetNativeLibraryName(WideToUTF16(kDwmapiLibraryName))),
+        &error);
   }
 
   if (dwmapi_library_ != NULL && composition_func_ == NULL) {
     composition_func_ = reinterpret_cast<DwmEnableCompositionFunc>(
         base::GetFunctionPointerFromNativeLibrary(dwmapi_library_,
                                                   "DwmEnableComposition"));
   }
 
   // Vote to disable Aero composited desktop effects while capturing. Windows
   // will restore Aero automatically if the process exits. This has no effect
@@ skipping 361 matching lines @@
 }
 
 }  // namespace
 
 // static
 Capturer* Capturer::Create() {
   return new CapturerGdi();
 }
 
 }  // namespace remoting