win: Don't use delegate_execute to relaunch on Win10+

chrome/browser/first_run/upgrade_util_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 "chrome/browser/first_run/upgrade_util.h"
 
 #include <windows.h>
 #include <psapi.h>
 #include <shellapi.h>
 
@@ skipping 143 matching lines @@
     NOTREACHED();
     return false;
   }
 
   // Explicitly make sure to relaunch chrome.exe rather than old_chrome.exe.
   // This can happen when old_chrome.exe is launched by a user.
   base::CommandLine chrome_exe_command_line = command_line;
   chrome_exe_command_line.SetProgram(
       chrome_exe.DirName().Append(installer::kChromeExe));
 
-  if (base::win::GetVersion() < base::win::VERSION_WIN8 &&
+  if (base::win::GetVersion() != base::win::VERSION_WIN8 &&
+      base::win::GetVersion() != base::win::VERSION_WIN8_1 &&

[gab, 2015/10/29 21:06:05]

I tend to prefer version ranges to strict comparison (i.e. <Win8 >=Win10
highlights the intent better.

[scottmg, 2015/10/29 21:30:36]

Done.

       relaunch_mode != RELAUNCH_MODE_METRO &&
       relaunch_mode != RELAUNCH_MODE_DESKTOP) {

[gab, 2015/10/29 21:06:05]

Does the |relaunch_mode| really matter on non-Win8?

[scottmg, 2015/10/29 21:30:36]

I ... don't know. It seems like it shouldn't, I guess it's probably for the fake
ash mode on Win7?

     return base::LaunchProcess(chrome_exe_command_line,
                                base::LaunchOptions()).IsValid();
   }
 
   // On Windows 8 we always use the delegate_execute for re-launching chrome.
   // On Windows 7 we use delegate_execute for re-launching chrome into Windows
   // ASH.
   //
   // Pass this Chrome's Start Menu shortcut path to the relauncher so it can re-
   // activate chrome via ShellExecute which will wait until we exit. Since
@@ skipping 133 matching lines @@
     return false;
   // At this point the chrome.exe has been swapped with the new one.
   if (!RelaunchChromeBrowser(command_line)) {
     // The re-launch fails. Feel free to panic now.
     NOTREACHED();
   }
   return true;
 }
 
 }  // namespace upgrade_util