Add a GetRegistryPath method to BrowserDistribution.

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>
 
@@ skipping 840 matching lines @@
 }
 
 // Removes the persistent state for |distribution| 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(BrowserDistribution* distribution) {
   static const base::char16* const kKeysToPreserve[] = {
       L"Extensions",
       L"NativeMessagingHosts",
   };
-  base::string16 key_name(L"Software\\");
-  key_name += distribution->GetInstallSubDir();
   // Delete the contents of the distribution key except for those parts used by
   // outsiders to configure Chrome.
   DeleteRegistryKeyPartial(
-      HKEY_CURRENT_USER, key_name,
+      HKEY_CURRENT_USER, distribution->GetRegistryPath(),
       std::vector<base::string16>(
           &kKeysToPreserve[0],
           &kKeysToPreserve[arraysize(kKeysToPreserve) - 1]));
 }
 
 }  // namespace
 
 DeleteResult DeleteChromeDirectoriesIfEmpty(
     const base::FilePath& application_directory) {
   DeleteResult result(DeleteEmptyDir(application_directory));
@@ skipping 562 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