Cleaned up usage of std::wstring in src/remoting. Added presubmit warning supressions for the reman…

remoting/host/host_event_logger_win.cc

Index: remoting/host/host_event_logger_win.cc
diff --git a/remoting/host/host_event_logger_win.cc b/remoting/host/host_event_logger_win.cc
index afad08ce3776ba1e94d368f1640b0f6017e038c8..85f31d26c1d01c8168d17dd46cb134eaa6a984b9 100644
--- a/remoting/host/host_event_logger_win.cc
+++ b/remoting/host/host_event_logger_win.cc
@@ -25,8 +25,7 @@ namespace {
 
 class HostEventLoggerWin : public HostEventLogger, public HostStatusObserver {
  public:
-  HostEventLoggerWin(ChromotingHost* host,
-                     const std::string& application_name);
+  HostEventLoggerWin(ChromotingHost* host, const std::string& application_name);
 
   virtual ~HostEventLoggerWin();
 
@@ -43,7 +42,7 @@ class HostEventLoggerWin : public HostEventLogger, public HostStatusObserver {
 
  private:
   void LogString(WORD type, DWORD event_id, const std::string& string);
-  void Log(WORD type, DWORD event_id, const std::vector<string16>& strings);
+  void Log(WORD type, DWORD event_id, const std::vector<std::string>& strings);
 
   scoped_refptr<ChromotingHost> host_;
 
@@ -60,7 +59,7 @@ HostEventLoggerWin::HostEventLoggerWin(ChromotingHost* host,
     : host_(host),
       event_log_(NULL) {
   event_log_ = RegisterEventSourceW(NULL,
-                                    ASCIIToUTF16(application_name).c_str());
+                                    UTF8ToUTF16(application_name).c_str());
   if (event_log_ != NULL) {
     host_->AddStatusObserver(this);
   } else {
@@ -92,13 +91,12 @@ void HostEventLoggerWin::OnClientRouteChange(
     const std::string& jid,
     const std::string& channel_name,
     const protocol::TransportRoute& route) {
-  std::vector<string16> strings(5);
-  strings[0] = ASCIIToUTF16(jid);
-  strings[1] = ASCIIToUTF16(route.remote_address.ToString());
-  strings[2] = ASCIIToUTF16(route.local_address.ToString());
-  strings[3] = ASCIIToUTF16(channel_name);
-  strings[4] = ASCIIToUTF16(
-      protocol::TransportRoute::GetTypeString(route.type));
+  std::vector<std::string> strings(5);
+  strings[0] = jid;
+  strings[1] = route.remote_address.ToString();
+  strings[2] = route.local_address.ToString();
+  strings[3] = channel_name;
+  strings[4] = protocol::TransportRoute::GetTypeString(route.type);
   Log(EVENTLOG_INFORMATION_TYPE, MSG_HOST_CLIENT_ROUTING_CHANGED, strings);
 }
 
@@ -107,15 +105,17 @@ void HostEventLoggerWin::OnShutdown() {
 
 void HostEventLoggerWin::Log(WORD type,
                              DWORD event_id,
-                             const std::vector<string16>& strings) {
+                             const std::vector<std::string>& strings) {
   if (event_log_ == NULL)
     return;
 
   // ReportEventW() takes an array of raw string pointers. They should stay
   // valid for the duration of the call.
   std::vector<const WCHAR*> raw_strings(strings.size());
+  std::vector<string16> utf16_strings(strings.size());
   for (size_t i = 0; i < strings.size(); ++i) {
-    raw_strings[i] = strings[i].c_str();
+    utf16_strings[i] = UTF8ToUTF16(strings[i]);
+    raw_strings[i] = utf16_strings[i].c_str();

[Wez, 2012/08/03 21:26:15]

nit: Clarify in the comment above that this is OK only because wide-characters
are 16-bit on Windows?
nit: It seems weird to be making that assumption here, where in other
Windows-specific code in this CL we use UTF8ToWide()...

[alexeypa (please no reviews), 2012/08/03 22:00:18]

I wound need to write such a comment next to every Win32 API call then. I don't
think that this is a good stop to document this... mess.
There is a bit of logic:

WCHAR, string16 == UTF-16
wchar_t, wstring == wide

In other places whene we do XxxToWide wither wchar_t or wstring is used.

[Wez, 2012/08/06 17:29:38]

Yeah, we definitely don't want that, but at the same time it's really confusing
to have swathes of code using string16/UTF8ToUTF16 while other parts use
wstring/UTF8ToWide, with no clear distinction.
Right; but there seems to be code you're touching elsewhere in this CL that uses
wstring and/or UTF8ToWide for no good reason; i.e. where UTF16 would do.

[alexeypa (please no reviews), 2012/08/06 17:56:18]

I'm sorry for being blind but I don't see that. :-) What exact file and line are
you talking about?

   }
 
   if (!ReportEventW(event_log_,
@@ -134,8 +134,8 @@ void HostEventLoggerWin::Log(WORD type,
 void HostEventLoggerWin::LogString(WORD type,
                                    DWORD event_id,
                                    const std::string& string) {
-  std::vector<string16> strings;
-  strings.push_back(ASCIIToUTF16(string));
+  std::vector<std::string> strings;
+  strings.push_back(string);
   Log(type, event_id, strings);
 }