Revert "desktop-pwas: Get install mode from user-data dir"

This reverts commit 9825d9be.

Reason for revert: This approach is no longer needed for Progressive
Web Apps to find chrome.exe. The path for chrome.exe will be saved in
the user-data directory instead (crrev.com/c/1891121).

Original change's description:
> desktop-pwas: Get install mode from user-data dir
>
> This change adds function GetUserDataSuffix(), which returns the install
> suffix (e.g. "" for the primary install mode, " SxS", " Beta", or
> " Dev") given a path in the User Data folder.
>
> It is based on GetInstallSuffix(), which does the same given a path in
> the Application folder.
>
> This new function is the first part of finding the location of
> chrome.exe from within the User Data directory, where Progressive Web
> App (PWA) launchers are planned to be. The next step will be a function
> that uses the install mode from FindInstallMode(GetUserDataSuffix()) to
> get the full path of chrome.exe, which PWAs can then use to launch.
>
> Change-Id: If69859fc5f36b7d2d2c4262a1955bd432d983597
> Bug: 960245
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866977
> Commit-Queue: Jesse McKenna <jessemckenna@google.com>
> Reviewed-by: Greg Thompson <grt@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#708663}

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 960245
Change-Id: I96a4c65176b89c86642bc9eba9a90942c1c724ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1914480Reviewed-by: Greg Thompson <grt@chromium.org>
Commit-Queue: Jesse McKenna <jessemckenna@google.com>
Cr-Commit-Position: refs/heads/master@{#715306}

chrome/install_static/product_install_details.cc

@@ -17,8 +17,6 @@ namespace install_static {
 
 namespace {
 
-enum class InstallChildDir { kApplication, kUserData };
-
 // Returns the executable path for the current process.
 std::wstring GetCurrentProcessExePath() {
   std::wstring exe_path(MAX_PATH, L'\0');
@@ -29,63 +27,6 @@ std::wstring GetCurrentProcessExePath() {
   return exe_path;
 }
 
-// Returns the install suffix embedded in |exe_path| or an empty string if none
-// is found. |install_child_dir| is the directory directly below the one
-// containing the install suffix. |exe_path| is expected be something similar to
-// "...\[kProductPathName][suffix]\[install_child_dir]".
-std::wstring GetInstallSuffixFromChildDir(const std::wstring& exe_path,
-                                          InstallChildDir install_child_dir) {
-  static constexpr wchar_t kApplicationDirName[] = L"\\Application";
-  static constexpr wchar_t kUserDataDirName[] = L"\\User Data";
-  const bool in_application_dir =
-      install_child_dir == InstallChildDir::kApplication;
-  const wchar_t* const install_child_dir_name =
-      in_application_dir ? kApplicationDirName : kUserDataDirName;
-
-  // Get length of |install_child_dir_name| as signed integer to allow
-  // comparison with the distance between iterators (which is signed).
-  const int install_child_dir_length =
-      in_application_dir ? static_cast<int>(_countof(kApplicationDirName) - 1)
-                         : static_cast<int>(_countof(kUserDataDirName) - 1);
-
-  // Search backwards from the end of the path for |install_child_dir_name|,
-  // using a manual search for the sake of case-insensitivity.
-  if (exe_path.size() < kProductPathNameLength + install_child_dir_length)
-    return std::wstring();
-  std::wstring::const_reverse_iterator scan =
-      exe_path.crbegin() + (install_child_dir_length - 1);
-  while (_wcsnicmp(&*scan, install_child_dir_name, install_child_dir_length) &&
-         ++scan != exe_path.crend()) {
-  }
-  if (scan == exe_path.crend())
-    return std::wstring();
-
-  // Ensure that the dir is followed by a separator or is at the end of the
-  // path.
-  if (scan - exe_path.crbegin() != install_child_dir_length - 1 &&
-      *(scan - install_child_dir_length) != L'\\') {
-    return std::wstring();
-  }
-
-  // Scan backwards to the next separator or the beginning of the path.
-  std::wstring::const_reverse_iterator name =
-      std::find(scan + 1, exe_path.crend(), L'\\');
-  // Back up one character to ignore the separator/end of iteration.
-  if (name == exe_path.crend())
-    name = exe_path.crbegin() + exe_path.size() - 1;
-  else
-    --name;
-
-  // Check for a match of the product directory name.
-  if (_wcsnicmp(&*name, kProductPathName, kProductPathNameLength))
-    return std::wstring();
-
-  // Return the (possibly empty) suffix betwixt the product name and
-  // |install_child_dir|.
-  return std::wstring(&*(name - kProductPathNameLength),
-                      (name - scan) - kProductPathNameLength);
-}
-
 const InstallConstants* FindInstallMode(const std::wstring& suffix) {
   // Search for a mode with the matching suffix.
   for (int i = 0; i < NUM_INSTALL_MODES; ++i) {
@@ -137,12 +78,44 @@ bool PathIsInProgramFiles(const std::wstring& path) {
 }
 
 std::wstring GetInstallSuffix(const std::wstring& exe_path) {
-  return GetInstallSuffixFromChildDir(exe_path, InstallChildDir::kApplication);
-}
+  // Search backwards from the end of the path for "\Application", using a
+  // manual search for the sake of case-insensitivity.
+  static constexpr wchar_t kInstallBinaryDir[] = L"\\Application";
+  constexpr size_t kInstallBinaryDirLength = _countof(kInstallBinaryDir) - 1;
+  if (exe_path.size() < kProductPathNameLength + kInstallBinaryDirLength)
+    return std::wstring();
+  std::wstring::const_reverse_iterator scan =
+      exe_path.crbegin() + (kInstallBinaryDirLength - 1);
+  while (_wcsnicmp(&*scan, kInstallBinaryDir, kInstallBinaryDirLength) &&
+         ++scan != exe_path.crend()) {
+  }
+  if (scan == exe_path.crend())
+    return std::wstring();
+
+  // Ensure that the dir is followed by a separator or is at the end of the
+  // path.
+  if (scan - exe_path.crbegin() != kInstallBinaryDirLength - 1 &&
+      *(scan - kInstallBinaryDirLength) != L'\\') {
+    return std::wstring();
+  }
+
+  // Scan backwards to the next separator or the beginning of the path.
+  std::wstring::const_reverse_iterator name =
+      std::find(scan + 1, exe_path.crend(), L'\\');
+  // Back up one character to ignore the separator/end of iteration.
+  if (name == exe_path.crend())
+    name = exe_path.crbegin() + exe_path.size() - 1;
+  else
+    --name;
 
-std::wstring GetUserDataSuffix(const std::wstring& user_data_path) {
-  return GetInstallSuffixFromChildDir(user_data_path,
-                                      InstallChildDir::kUserData);
+  // Check for a match of the product directory name.
+  if (_wcsnicmp(&*name, kProductPathName, kProductPathNameLength))
+    return std::wstring();
+
+  // Return the (possibly empty) suffix betwixt the product name and install
+  // binary dir.
+  return std::wstring(&*(name - kProductPathNameLength),
+                      (name - scan) - kProductPathNameLength);
 }
 
 std::unique_ptr<PrimaryInstallDetails> MakeProductDetails(

chrome/install_static/product_install_details.h

@@ -32,14 +32,9 @@ bool PathIsInProgramFiles(const std::wstring& path);
 
 // Returns the install suffix embedded in |exe_path| or an empty string if none
 // is found. |exe_path| is expected be something similar to
-// "...\[kProductPathName][suffix]\Application".
+// "...\[kProductName][suffix]\Application".
 std::wstring GetInstallSuffix(const std::wstring& exe_path);
 
-// Returns the install suffix embedded in |user_data_path| or an empty string if
-// none is found. |user_data_path| is expected be something similar to
-// "...\[kProductPathName][suffix]\User Data".
-std::wstring GetUserDataSuffix(const std::wstring& user_data_path);
-
 // Creates product details for the process at |exe_path|.
 std::unique_ptr<PrimaryInstallDetails> MakeProductDetails(
     const std::wstring& exe_path);

chrome/install_static/product_install_details_unittest.cc

@@ -122,26 +122,6 @@ TEST(ProductInstallDetailsTest, GetInstallSuffix) {
   }
 }
 
-TEST(ProductInstallDetailsTest, GetUserDataSuffix) {
-  std::wstring suffix;
-  const std::pair<const wchar_t*, const wchar_t*> kData[] = {
-      {L"%ls\\User Data", L""},
-      {L"%ls\\User Data\\", L""},
-      {L"\\%ls\\User Data", L""},
-      {L"\\%ls\\User Data\\", L""},
-      {L"C:\\foo\\%ls\\User Data\\foo.exe", L""},
-      {L"%ls Blorf\\User Data", L" Blorf"},
-      {L"%ls Blorf\\User Data\\", L" Blorf"},
-      {L"\\%ls Blorf\\User Data", L" Blorf"},
-      {L"\\%ls Blorf\\User Data\\", L" Blorf"},
-      {L"C:\\foo\\%ls Blorf\\User Data\\foo.exe", L" Blorf"},
-  };
-  for (const auto& data : kData) {
-    const std::wstring path = base::StringPrintf(data.first, kProductPathName);
-    EXPECT_EQ(std::wstring(data.second), GetUserDataSuffix(path)) << path;
-  }
-}
-
 struct TestData {
   const wchar_t* path;
   InstallConstantIndex index;