Revert "Add chrome_proxy.exe target for bookmark app shortcuts to target on Windows"

This reverts commit 6d4576ad.

Reason for revert:
On second thought this is too risky to land on branch day.
Also I want to land the new binary separately from the shortcuts pointing to it so we can make sure it deploys properly before irreversibly depending on it (it's difficult to update shortcuts).

Original change's description:
> Add chrome_proxy.exe target for bookmark app shortcuts to target on Windows
> 
> This change adds a new executable to Windows called chrome_proxy.exe which
> opens chrome.exe with all arguments forwarded.
> 
> The purpose of the executable is for bookmark app shortcuts to target so
> they don't pick up the chrome.VisualElementsManifest.xml file when pinned
> to the Windows 10 start menu. This fixes a bug where pinned bookmark app
> shortcuts all use the Chrome logo instead of their own.
> 
> Bug: 732357
> Change-Id: I6f4385219329e6d6e446053fc1325082ce4328c6
> Reviewed-on: https://chromium-review.googlesource.com/c/1335075
> Reviewed-by: Lei Zhang <thestig@chromium.org>
> Reviewed-by: Greg Thompson <grt@chromium.org>
> Commit-Queue: Alan Cutter <alancutter@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#612477}

TBR=thestig@chromium.org,alancutter@chromium.org,mgiuca@chromium.org,grt@chromium.org

Change-Id: If327a489864c0bd6066ec13b3f9421f3be57636b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 732357
Reviewed-on: https://chromium-review.googlesource.com/c/1356163Reviewed-by: Alan Cutter <alancutter@chromium.org>
Commit-Queue: Alan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612478}

chrome/BUILD.gn

@@ -217,7 +217,6 @@ if (!is_android && !is_mac) {
         ]
         data_deps = [
           "//chrome/app/version_assembly:version_assembly_manifest",
-          "//chrome/chrome_proxy",
           "//chrome/elevation_service",
           "//chrome/notification_helper",
         ]

chrome/browser/web_applications/components/web_app_shortcut_win.cc

@@ -37,18 +37,9 @@
 
 namespace {
 
-constexpr base::FilePath::CharType kIconChecksumFileExt[] =
+const base::FilePath::CharType kIconChecksumFileExt[] =
     FILE_PATH_LITERAL(".ico.md5");
 
-constexpr base::FilePath::CharType kChromeProxyExecutable[] =
-    FILE_PATH_LITERAL("chrome_proxy.exe");
-
-base::FilePath GetChromeProxyPath() {
-  base::FilePath chrome_dir;
-  CHECK(base::PathService::Get(base::DIR_EXE, &chrome_dir));
-  return chrome_dir.Append(kChromeProxyExecutable);
-}
-
 // Calculates checksum of an icon family using MD5.
 // The checksum is derived from all of the icons in the family.
 void GetImageCheckSum(const gfx::ImageFamily& image, base::MD5Digest* digest) {
@@ -194,10 +185,14 @@ bool CreateShortcutsInPaths(const base::FilePath& web_app_path,
     return false;
   }
 
-  base::FilePath chrome_proxy_path = GetChromeProxyPath();
+  base::FilePath chrome_exe;
+  if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
+    NOTREACHED();
+    return false;
+  }
 
   // Working directory.
-  base::FilePath working_dir(chrome_proxy_path.DirName());
+  base::FilePath working_dir(chrome_exe.DirName());
 
   base::CommandLine cmd_line(base::CommandLine::NO_PROGRAM);
   cmd_line = shell_integration::CommandLineArgsForLauncher(
@@ -248,9 +243,7 @@ bool CreateShortcutsInPaths(const base::FilePath& web_app_path,
       }
     }
     base::win::ShortcutProperties shortcut_properties;
-    // Target a proxy executable instead of Chrome directly to ensure start menu
-    // pinning uses the correct icon. See https://crbug.com/732357 for details.
-    shortcut_properties.set_target(chrome_proxy_path);
+    shortcut_properties.set_target(chrome_exe);
     shortcut_properties.set_working_dir(working_dir);
     shortcut_properties.set_arguments(wide_switches);
     shortcut_properties.set_description(description);
@@ -345,7 +338,12 @@ void CreateIconAndSetRelaunchDetails(
                                                     shortcut_info.extension_id,
                                                     shortcut_info.profile_path);
 
-  command_line.SetProgram(GetChromeProxyPath());
+  base::FilePath chrome_exe;
+  if (!base::PathService::Get(base::FILE_EXE, &chrome_exe)) {
+    NOTREACHED();
+    return;
+  }
+  command_line.SetProgram(chrome_exe);
   ui::win::SetRelaunchDetailsForWindow(command_line.GetCommandLineString(),
                                        shortcut_info.title, hwnd);
 

chrome/chrome_proxy/BUILD.gn

-# Copyright 2018 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.
-
-assert(is_win)
-
-import("//chrome/process_version_rc_template.gni")
-
-process_version_rc_template("chrome_proxy_version") {
-  sources = [
-    "chrome_proxy.ver",
-  ]
-  output = "$target_gen_dir/chrome_proxy_version.rc"
-}
-
-executable("chrome_proxy") {
-  deps = [
-    ":chrome_proxy_version",
-    "//base",
-    "//chrome/app/version_assembly:chrome_exe_manifest",
-  ]
-
-  data_deps = [
-    "//chrome/app/version_assembly:version_assembly_manifest",
-  ]
-
-  sources = [
-    "chrome_proxy_main_win.cc",
-  ]
-
-  configs -= [ "//build/config/win:console" ]
-  configs += [ "//build/config/win:windowed" ]
-}

chrome/chrome_proxy/OWNERS

-alancutter@chromium.org
-mgiuca@chromium.org
-
-# COMPONENT: UI>Browser>WebAppInstalls

chrome/chrome_proxy/chrome_proxy.ver

-INTERNAL_NAME=chrome_proxy
-ORIGINAL_FILENAME=chrome_proxy.exe

chrome/chrome_proxy/chrome_proxy_main_win.cc

-// Copyright 2018 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 <windows.h>
-
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/logging.h"
-#include "base/path_service.h"
-#include "base/process/launch.h"
-
-namespace {
-
-constexpr base::FilePath::CharType kChromeExecutable[] =
-    FILE_PATH_LITERAL("chrome.exe");
-
-constexpr base::FilePath::CharType kChromeProxyExecutable[] =
-    FILE_PATH_LITERAL("chrome_proxy.exe");
-
-}  // namespace
-
-int WINAPI wWinMain(HINSTANCE instance,
-                    HINSTANCE prev_instance,
-                    wchar_t* /*command_line*/,
-                    int show_command) {
-  base::CommandLine::Init(0, nullptr);
-
-  logging::LoggingSettings logging_settings;
-  logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
-  logging::InitLogging(logging_settings);
-
-  base::FilePath chrome_dir;
-  CHECK(base::PathService::Get(base::DIR_EXE, &chrome_dir));
-  base::CommandLine chrome_command_line(chrome_dir.Append(kChromeExecutable));
-
-  // Forward all command line arguments.
-  const std::vector<base::string16>& argv =
-      base::CommandLine::ForCurrentProcess()->argv();
-  // The first one is always the current executable path.
-  CHECK(argv.size() > 0);
-  CHECK_EQ(base::FilePath(argv[0]).BaseName().value(), kChromeProxyExecutable);
-  for (size_t i = 1; i < argv.size(); ++i)
-    chrome_command_line.AppendArgNative(argv[i]);
-
-  base::LaunchOptions launch_options;
-  launch_options.current_directory = chrome_dir;
-  launch_options.grant_foreground_privilege = true;
-  CHECK(base::LaunchProcess(chrome_command_line, launch_options).IsValid());
-
-  return 0;
-}

chrome/installer/mini_installer/BUILD.gn

@@ -91,7 +91,6 @@ group("chrome_runtime_deps") {
   write_runtime_deps = chrome_runtime_deps
   data_deps = [
     "//chrome",
-    "//chrome/chrome_proxy",
   ]
 }
 

chrome/installer/mini_installer/chrome.release

@@ -7,7 +7,6 @@
 # Chrome Application dir entries, sorted alphabetically.
 #
 chrome.exe: %(ChromeDir)s\
-chrome_proxy.exe: %(ChromeDir)s\
 #
 # Chrome version dir assembly manifest.
 # The name of this file must match the name of the version dir, so we cannot

chrome/installer/setup/install_worker.cc

@@ -721,16 +721,14 @@ base::string16 GetUpdatedBrandCode(const base::string16& brand_code) {
 
 bool AppendPostInstallTasks(const InstallerState& installer_state,
                             const base::FilePath& setup_path,
-                            const base::FilePath& src_path,
-                            const base::FilePath& temp_path,
                             const base::Version* current_version,
                             const base::Version& new_version,
                             WorkItemList* post_install_task_list) {
   DCHECK(post_install_task_list);
 
   HKEY root = installer_state.root_key();
-  const base::FilePath& target_path = installer_state.target_path();
-  base::FilePath new_chrome_exe(target_path.Append(kChromeNewExe));
+  base::FilePath new_chrome_exe(
+      installer_state.target_path().Append(installer::kChromeNewExe));
 
   // Append work items that will only be executed if this was an update.
   // We update the 'opv' value with the current version that is active,
@@ -781,12 +779,6 @@ bool AppendPostInstallTasks(const InstallerState& installer_state,
         root, clients_key, KEY_WOW64_32KEY, google_update::kRegRenameCmdField,
         product_rename_cmd.GetCommandLineString(), true);
 
-    // Delay deploying the new chrome_proxy while chrome is running.
-    in_use_update_work_items->AddCopyTreeWorkItem(
-        src_path.Append(kChromeProxyExe).value(),
-        target_path.Append(kChromeProxyNewExe).value(), temp_path.value(),
-        WorkItem::ALWAYS);
-
     post_install_task_list->AddWorkItem(in_use_update_work_items.release());
   }
 
@@ -807,13 +799,6 @@ bool AppendPostInstallTasks(const InstallerState& installer_state,
     regular_update_work_items->AddDeleteRegValueWorkItem(
         root, clients_key, KEY_WOW64_32KEY, google_update::kRegRenameCmdField);
 
-    // Only copy chrome_proxy.exe directly when chrome.exe isn't in use to avoid
-    // different versions getting mixed up between the two binaries.
-    regular_update_work_items->AddCopyTreeWorkItem(
-        src_path.Append(kChromeProxyExe).value(),
-        target_path.Append(kChromeProxyExe).value(), temp_path.value(),
-        WorkItem::ALWAYS);
-
     post_install_task_list->AddWorkItem(regular_update_work_items.release());
   }
 
@@ -954,8 +939,11 @@ void AddInstallWorkItems(const InstallationState& original_state,
   AddUpdateBrandCodeWorkItem(installer_state, install_list);
 
   // Append the tasks that run after the installation.
-  AppendPostInstallTasks(installer_state, setup_path, src_path, temp_path,
-                         current_version, new_version, install_list);
+  AppendPostInstallTasks(installer_state,
+                         setup_path,
+                         current_version,
+                         new_version,
+                         install_list);
 }
 
 void AddNativeNotificationWorkItems(

chrome/installer/setup/install_worker.h

@@ -62,10 +62,9 @@ base::string16 GetUpdatedBrandCode(const base::string16& brand_code);
 // |current_version| can be NULL to indicate no Chrome is currently installed.
 bool AppendPostInstallTasks(const InstallerState& installer_state,
                             const base::FilePath& setup_path,
-                            const base::FilePath& src_path,
-                            const base::FilePath& temp_path,
                             const base::Version* current_version,
                             const base::Version& new_version,
+                            const base::FilePath& temp_path,
                             WorkItemList* post_install_task_list);
 
 // Builds the complete WorkItemList used to build the set of installation steps

chrome/installer/setup/setup_main.cc

@@ -402,12 +402,11 @@ installer::InstallStatus RepeatDeleteOldVersions(
 
 // This function is called when --rename-chrome-exe option is specified on
 // setup.exe command line. This function assumes an in-use update has happened
-// for Chrome so there should be files called new_chrome.exe and
-// new_chrome_proxy.exe on the file system and a key called 'opv' in the
-// registry. This function will move new_chrome.exe to chrome.exe,
-// new_chrome_proxy.exe to chrome_proxy.exe and delete 'opv' key in one atomic
-// operation. This function also deletes elevation policies associated with the
-// old version if they exist. |setup_exe| is the path to the current executable.
+// for Chrome so there should be a file called new_chrome.exe on the file
+// system and a key called 'opv' in the registry. This function will move
+// new_chrome.exe to chrome.exe and delete 'opv' key in one atomic operation.
+// This function also deletes elevation policies associated with the old version
+// if they exist. |setup_exe| is the path to the current executable.
 installer::InstallStatus RenameChromeExecutables(
     const base::FilePath& setup_exe,
     const InstallationState& original_state,
@@ -416,12 +415,6 @@ installer::InstallStatus RenameChromeExecutables(
   base::FilePath chrome_exe(target_path.Append(installer::kChromeExe));
   base::FilePath chrome_new_exe(target_path.Append(installer::kChromeNewExe));
   base::FilePath chrome_old_exe(target_path.Append(installer::kChromeOldExe));
-  base::FilePath chrome_proxy_exe(
-      target_path.Append(installer::kChromeProxyExe));
-  base::FilePath chrome_proxy_new_exe(
-      target_path.Append(installer::kChromeProxyNewExe));
-  base::FilePath chrome_proxy_old_exe(
-      target_path.Append(installer::kChromeProxyOldExe));
 
   // Create a temporary backup directory on the same volume as chrome.exe so
   // that moving in-use files doesn't lead to trouble.
@@ -445,16 +438,6 @@ installer::InstallStatus RenameChromeExecutables(
                                     WorkItem::ALWAYS_MOVE);
   install_list->AddDeleteTreeWorkItem(chrome_new_exe, temp_path.path());
 
-  // Move chrome_proxy.exe to old_chrome_proxy.exe, then move
-  // new_chrome_proxy.exe to chrome_proxy.exe.
-  install_list->AddMoveTreeWorkItem(
-      chrome_proxy_exe.value(), chrome_proxy_old_exe.value(),
-      temp_path.path().value(), WorkItem::ALWAYS_MOVE);
-  install_list->AddMoveTreeWorkItem(
-      chrome_proxy_new_exe.value(), chrome_proxy_exe.value(),
-      temp_path.path().value(), WorkItem::ALWAYS_MOVE);
-  install_list->AddDeleteTreeWorkItem(chrome_proxy_new_exe, temp_path.path());
-
   // Add work items to delete Chrome's "opv", "cpv", and "cmd" values.
   // TODO(grt): Clean this up; https://crbug.com/577816.
   HKEY reg_root = installer_state->root_key();
@@ -471,8 +454,6 @@ installer::InstallStatus RenameChromeExecutables(
   // old_chrome.exe is still in use in most cases, so ignore failures here.
   install_list->AddDeleteTreeWorkItem(chrome_old_exe, temp_path.path())
       ->set_best_effort(true);
-  install_list->AddDeleteTreeWorkItem(chrome_proxy_old_exe, temp_path.path())
-      ->set_best_effort(true);
 
   installer::InstallStatus ret = installer::RENAME_SUCCESSFUL;
   if (install_list->Do()) {

chrome/installer/util/util_constants.cc

@@ -196,9 +196,6 @@ const wchar_t kChromeChildDll[] = L"chrome_child.dll";
 const wchar_t kChromeExe[] = L"chrome.exe";
 const wchar_t kChromeNewExe[] = L"new_chrome.exe";
 const wchar_t kChromeOldExe[] = L"old_chrome.exe";
-const wchar_t kChromeProxyExe[] = L"chrome_proxy.exe";
-const wchar_t kChromeProxyNewExe[] = L"new_chrome_proxy.exe";
-const wchar_t kChromeProxyOldExe[] = L"old_chrome_proxy.exe";
 const wchar_t kCmdOnOsUpgrade[] = L"on-os-upgrade";
 const wchar_t kCmdStoreDMToken[] = L"store-dmtoken";
 const wchar_t kEulaSentinelFile[] = L"EULA Accepted";

chrome/installer/util/util_constants.h

@@ -206,9 +206,6 @@ extern const wchar_t kChromeChildDll[];
 extern const wchar_t kChromeExe[];
 extern const wchar_t kChromeNewExe[];
 extern const wchar_t kChromeOldExe[];
-extern const wchar_t kChromeProxyExe[];
-extern const wchar_t kChromeProxyNewExe[];
-extern const wchar_t kChromeProxyOldExe[];
 extern const wchar_t kCmdOnOsUpgrade[];
 extern const wchar_t kCmdStoreDMToken[];
 extern const wchar_t kEulaSentinelFile[];

chrome/test/mini_installer/config/chrome_beta_installed.prop

@@ -3,7 +3,6 @@
   "Files": {
     "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\chrome.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\chrome_proxy.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":

chrome/test/mini_installer/config/chrome_canary_installed.prop

@@ -3,7 +3,6 @@
   "Files": {
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome_proxy.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":

chrome/test/mini_installer/config/chrome_dev_installed.prop

@@ -3,7 +3,6 @@
   "Files": {
     "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\chrome.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\chrome_proxy.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":

chrome/test/mini_installer/config/chrome_multi_system_installed.prop

@@ -2,7 +2,6 @@
   "Files": {
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome_proxy.exe": {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":

chrome/test/mini_installer/config/chrome_multi_user_installed.prop

@@ -2,7 +2,6 @@
   "Files": {
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome_proxy.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":

chrome/test/mini_installer/config/chrome_system_installed.prop

@@ -2,7 +2,6 @@
   "Files": {
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome_proxy.exe": {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":

chrome/test/mini_installer/config/chrome_user_installed.prop

@@ -2,7 +2,6 @@
   "Files": {
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome_proxy.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":

chrome/test/mini_installer/config/previous_chrome_canary_installed.prop

@@ -3,7 +3,6 @@
   "Files": {
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome_proxy.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z": {"exists": true},

chrome/test/mini_installer/config/previous_chrome_system_installed.prop

@@ -2,7 +2,6 @@
   "Files": {
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome_proxy.exe": {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":

chrome/test/mini_installer/config/previous_chrome_user_installed.prop

@@ -2,7 +2,6 @@
   "Files": {
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome_proxy.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":

chrome/tools/build/win/FILES.cfg

@@ -845,15 +845,4 @@ FILES = [
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
-  # Bookmark apps shortcut target:
-  {
-    'filename': 'chrome_proxy.exe',
-    'buildtype': ['dev', 'official'],
-    'filegroup': ['default', 'symsrc'],
-  },
-  {
-    'filename': 'chrome_proxy.exe.pdb',
-    'buildtype': ['dev', 'official'],
-    'archive': 'chrome-win32-syms.zip',
-  },
 ]