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

remoting/host/plugin/daemon_installer_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/plugin/daemon_installer_win.h"
 
 #include <windows.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 267 matching lines @@
   // Get the full path to GoogleUpdate.exe from the registry.
   base::win::RegKey update_key;
   LONG result = update_key.Open(HKEY_CURRENT_USER,
                                 kOmahaUpdateKeyName,
                                 KEY_READ);
   if (result != ERROR_SUCCESS) {
     Done(HRESULT_FROM_WIN32(result));
     return;
   }
 
+  // presubmit: allow wstring
   std::wstring google_update;
-  result = update_key.ReadValue(kOmahaPathValueName,
-                                &google_update);
+  result = update_key.ReadValue(kOmahaPathValueName, &google_update);
   if (result != ERROR_SUCCESS) {
     Done(HRESULT_FROM_WIN32(result));
     return;
   }
 
   // Launch the updater process and wait for its termination.
-  std::wstring command_line =
+  string16 command_line = WideToUTF16(
       StringPrintf(kGoogleUpdateCommandLineFormat,
                    google_update.c_str(),
                    kHostOmahaAppid,
-                   kOmahaLanguage);
+                   kOmahaLanguage));
 
   base::LaunchOptions options;
-  if (!base::LaunchProcess(WideToUTF16(command_line), options,
-                           process_.Receive())) {
+  if (!base::LaunchProcess(command_line, options, process_.Receive())) {
     result = GetLastError();
     Done(HRESULT_FROM_WIN32(result));
     return;
   }
 
   if (!process_watcher_.StartWatching(process_.Get(), this)) {
     result = GetLastError();
     Done(HRESULT_FROM_WIN32(result));
     return;
   }
@@ skipping 85 matching lines @@
     HWND parent = GetAncestor(window, GA_PARENT);
     if (parent == NULL) {
       return window;
     }
 
     window = parent;
   }
 }
 
 }  // namespace remoting