Removing WinXP and Vista specific code from Chromoting.

remoting/host/win/com_security.cc

 // Copyright 2013 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/win/com_security.h"
 
 #include <objidl.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/win/windows_version.h"
 #include "remoting/host/win/security_descriptor.h"
 
 namespace remoting {
 
 bool InitializeComSecurity(const std::string& security_descriptor,
                            const std::string& mandatory_label,
                            bool activate_as_activator) {
-  std::string sddl = security_descriptor;
-  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
-    sddl += mandatory_label;
-  }
+  std::string sddl = security_descriptor + mandatory_label;

[Jamie, 2016/06/06 18:05:18]

Does it still make sense to separate these parameters at the call-site?

[Hzj_jie, 2016/06/06 18:48:54]

+1

[joedow, 2016/06/06 22:49:45]

Acknowledged.  I looked at the two call sites and I think it is cleaner to allow
them to pass the two strings separately and combine them here within the
function.  Sddl strings can get a bit unwieldy (i.e. difficult to parse) if you
try to build everything up at once, I find that it is easier if each logical
piece is defined and combined later on.

 
   // Convert the SDDL description into a security descriptor in absolute format.
   ScopedSd relative_sd = ConvertSddlToSd(sddl);
   if (!relative_sd) {
     PLOG(ERROR) << "Failed to create a security descriptor";
     return false;
   }
   ScopedSd absolute_sd;
   ScopedAcl dacl;
   ScopedSid group;
@@ skipping 24 matching lines @@
   if (FAILED(result)) {
     LOG(ERROR) << "CoInitializeSecurity() failed, result=0x"
                << std::hex << result << std::dec << ".";
     return false;
   }
 
   return true;
 }
 
 } // namespace remoting