desktop-pwas: Remove GetCurrentPath from launcher

This change removes the unneeded function GetCurrentExecutablePath
from the PWA launcher executable.

Previously, this function got the current executable's path and then
called base::NormalizeFilePath to preserve its capitalization.
Preserving the file path's capitalization was left over from when the
PWA launcher updated itself in-place, and therefore needed its
filename exactly as displayed in order to create an updated file with
that filename.

With the removal of this unneeded call to base::NormalizeFilePath, the
whole function is trivial and can be extracted into the rest of the
code.

This change also fixes LaunchResult::kMaxValue, which was incorrectly
set to an enum value that was not the highest.

Bug: 960245
Change-Id: If7d737d14f6cc56e0aab10a83fde8cd379e05ce0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2149945
Commit-Queue: Jesse McKenna <jessemckenna@google.com>
Reviewed-by: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759082}

chrome/browser/web_applications/chrome_pwa_launcher/chrome_pwa_launcher_main.cc

@@ -25,23 +25,16 @@ enum LaunchResult {
   kSuccess = 0,
   kStarted = 1,
   kError = 2,
-  kMaxValue = kStarted
+  kMaxValue = kError
 };
 
-// Returns the current executable's path, with capitalization preserved. If
-// getting the current path fails, the launcher crashes.
-base::FilePath GetCurrentExecutablePath() {
-  base::FilePath current_path;
-  CHECK(base::PathService::Get(base::FILE_EXE, &current_path));
-  base::NormalizeFilePath(current_path, &current_path);
-  return current_path;
-}
-
 // Returns the path to chrome.exe stored in the "Last Browser" file. If the file
 // is not found, can't be read, or does not contain a valid path, the launcher
 // crashes.
-base::FilePath GetChromePathFromLastBrowserFile(
-    const base::FilePath& current_path) {
+base::FilePath GetChromePathFromLastBrowserFile() {
+  base::FilePath current_path;
+  CHECK(base::PathService::Get(base::FILE_EXE, &current_path));
+
   // The Last Browser file is expected to be in the User Data directory, which
   // is the great-grandparent of the current directory (User Data\<profile>\Web
   // Applications\<app ID>).
@@ -99,8 +92,7 @@ int WINAPI wWinMain(HINSTANCE instance,
   logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(logging_settings);
 
-  base::FilePath current_path = GetCurrentExecutablePath();
-  base::FilePath chrome_path = GetChromePathFromLastBrowserFile(current_path);
+  const base::FilePath chrome_path = GetChromePathFromLastBrowserFile();
   install_static::InstallDetails::SetForProcess(
       install_static::MakeProductDetails(chrome_path.value()));