Revert "Updater: Allow branding in uninstall.cmd and enable --uninstall test."

This reverts commit 2fe1a951.

Reason for revert: Broke the build for Windows deterministic. First failure: https://ci.chromium.org/p/chromium/builders/ci/Windows%20deterministic/16277

Original change's description:
> Updater: Allow branding in uninstall.cmd and enable --uninstall test.
> 
> Bug: 1070206, 1062285
> Change-Id: Ia5c5222efcf2b90e41f1db9f5cac216a15befb4f
> Fixed: 1070206
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2147752
> Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
> Reviewed-by: Sorin Jianu <sorin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#758812}

TBR=sorin@chromium.org,waffles@chromium.org

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

Bug: 1070206, 1062285
Change-Id: I080bf5b0dc601f08b977971abdea2d74607cabc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153183Reviewed-by: Meredith Lane <meredithl@chromium.org>
Commit-Queue: Meredith Lane <meredithl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759916}

chrome/updater/BUILD.gn

@@ -218,10 +218,7 @@ if (is_win || is_mac) {
 
       deps += [ "//chrome/updater/win:updater_tests" ]
 
-      data_deps = [
-        "//chrome/updater/win:updater",
-        "//chrome/updater/win/installer",
-      ]
+      data_deps = [ "//chrome/updater/win:updater" ]
     }
 
     if (is_mac) {

chrome/updater/test/integration_tests.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/updater/test/integration_tests.h"
 
-#include "base/test/task_environment.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -23,12 +22,15 @@ class IntegrationTest : public ::testing::Test {
     ExpectClean();
     Clean();
   }
-
- private:
-  base::test::TaskEnvironment environment_;
 };
 
-TEST_F(IntegrationTest, InstallUninstall) {
+// TODO(crbug.com/1063064): Fix the test on Windows.
+#if defined(OS_WIN)
+#define MAYBE_InstallUninstall DISABLED_InstallUninstall
+#else
+#define MAYBE_InstallUninstall InstallUninstall
+#endif
+TEST_F(IntegrationTest, MAYBE_InstallUninstall) {
   Install();
   ExpectInstalled();
   Uninstall();

chrome/updater/test/integration_tests_win.cc

@@ -8,9 +8,6 @@
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/process/process.h"
-#include "base/synchronization/waitable_event.h"
-#include "base/task/task_traits.h"
-#include "base/task/thread_pool.h"
 #include "chrome/updater/updater_version.h"
 #include "chrome/updater/util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -35,15 +32,6 @@ bool Run(base::CommandLine command_line, int* exit_code) {
   if (!process.WaitForExitWithTimeout(base::TimeDelta::FromSeconds(60),
                                       exit_code))
     return false;
-  base::WaitableEvent sleep(base::WaitableEvent::ResetPolicy::MANUAL,
-                            base::WaitableEvent::InitialState::NOT_SIGNALED);
-  // The process will exit before it is done uninstalling: sleep for five
-  // seconds to allow uninstall to complete.
-  base::ThreadPool::PostDelayedTask(
-      FROM_HERE, {base::MayBlock()},
-      base::BindOnce(&base::WaitableEvent::Signal, base::Unretained(&sleep)),
-      base::TimeDelta::FromSeconds(5));
-  sleep.Wait();
   return true;
 }
 
@@ -80,7 +68,7 @@ void ExpectClean() {
 
   // Files must not exist on the file system.
 
-  EXPECT_FALSE(base::PathExists(GetProductPath()));
+  // EXPECT_FALSE(base::PathExists(GetProductPath()));
 }
 
 void ExpectInstalled() {

chrome/updater/win/BUILD.gn

@@ -2,9 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/util/process_version.gni")
 import("//chrome/process_version_rc_template.gni")
-import("//chrome/updater/branding.gni")
 import("//testing/test.gni")
 
 # This target builds the updater executable, its installer, and unittests.
@@ -35,16 +33,9 @@ executable("updater") {
   data_deps = [ ":uninstall.cmd" ]
 }
 
-process_version("uninstall.cmd") {
-  template_file = "setup/uninstall.cmd"
-  output = "$target_gen_dir/uninstall.cmd"
-  process_only = true
-  extra_args = [
-    "-e",
-    "PRODUCT_FULLNAME=\"$updater_product_full_name\"",
-    "-e",
-    "COMPANY_SHORTNAME=\"$updater_company_short_name\"",
-  ]
+copy("uninstall.cmd") {
+  sources = [ "setup/uninstall.cmd" ]
+  outputs = [ "$target_gen_dir/uninstall.cmd" ]
 }
 
 process_version_rc_template("version_resources") {

chrome/updater/win/setup/uninstall.cmd

-rem Deletes the script's parent directory if
-rem \AppData\Local\@COMPANY_SHORTNAME@\@PRODUCT_FULLNAME@\ is anywhere in the
-rem directory path.  Sleeps 3 seconds and tries 3 times to delete the
-rem directory.
+rem Deletes the script's parent directory if \AppData\Local\ChromeUpdater\ is
+rem anywhere in the directory path. Sleeps 3 seconds and tries 3 times to
+rem delete the directory.
 @echo off
 set Directory=%~dp0
-@echo %Directory% | FindStr /R \\AppData\\Local\\@COMPANY_SHORTNAME@\\@PRODUCT_FULLNAME@\\ > nul
+@echo %Directory% | FindStr /R \\AppData\\Local\\Google\\GoogleUpdater\\ > nul
 IF %ERRORLEVEL% NEQ 0 exit 1
 @echo Deleting "%Directory%"...
 for /L %%G IN (1,1,3) do (