Remove use of PRODUCT_STRING_PATH in chrome_elf.

chrome/installer/setup/uninstall.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.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include <windows.h>
 #include <stddef.h>
@@ skipping 556 matching lines @@
   VisitUserHives(base::Bind(&DeleteUserRegistryKeys, base::Unretained(&paths)));
 }
 
 // Removes the persistent blacklist state for the current user.  Note: this will
 // not remove the state for users other than the one uninstalling Chrome on a
 // system-level install (http://crbug.com/388725). Doing so would require
 // extracting the per-user registry hive iteration from
 // UninstallActiveSetupEntries so that it could service multiple tasks.
 void RemoveBlacklistState() {
   InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER,
-                                 blacklist::kRegistryBeaconPath,
+                                 install_static::GetRegistryPath().append(
+                                     blacklist::kRegistryBeaconKeyName),
                                  0);  // wow64_access
-// The following key is no longer used (https://crbug.com/631771).
-// This cleanup is being left in for a time though.
-#if defined(GOOGLE_CHROME_BUILD)
-  const wchar_t kRegistryFinchListPath[] =
-      L"SOFTWARE\\Google\\Chrome\\BLFinchList";
-#else
-  const wchar_t kRegistryFinchListPath[] =
-      L"SOFTWARE\\Chromium\\BLFinchList";
-#endif
-  InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER,
-                                 kRegistryFinchListPath,
-                                 0);  // wow64_access
+  // The following key is no longer used (https://crbug.com/631771). This
+  // cleanup is being left in for a time though.
+  InstallUtil::DeleteRegistryKey(
+      HKEY_CURRENT_USER,
+      install_static::GetRegistryPath().append(L"\\BLFinchList"),
+      0);  // wow64_access
 }
 
 // Removes the browser's persistent state in the Windows registry for the
 // current user. Note: this will not remove the state for users other than the
 // one uninstalling Chrome on a system-level install; see RemoveBlacklistState
 // for details.
 void RemoveDistributionRegistryState() {
   // Delete the contents of the distribution key except for those parts used by
   // outsiders to configure Chrome.
   DeleteRegistryKeyPartial(HKEY_CURRENT_USER, install_static::GetRegistryPath(),
@@ skipping 502 matching lines @@
     // If we need a reboot to continue, schedule the parent directories for
     // deletion unconditionally. If they are not empty, the session manager
     // will not delete them on reboot.
     ScheduleParentAndGrandparentForDeletion(target_path);
   } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) {
     *uninstall_status = UNINSTALL_FAILED;
   }
 }
 
 }  // namespace installer