Move ProgramCompare from setup_util to install_util.

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 <vector>
 
@@ skipping 208 matching lines @@
                            content::RESULT_CODE_HUNG, NULL);
   }
 }
 
 // This method tries to figure out if current user has registered Chrome.
 // It returns true iff there is a registered browser that will launch the
 // same chrome.exe as the current installation.
 bool CurrentUserHasDefaultBrowser(const InstallerState& installer_state) {
   using base::win::RegistryKeyIterator;
   const HKEY root = HKEY_LOCAL_MACHINE;
-  ProgramCompare open_command_pred(
+  InstallUtil::ProgramCompare open_command_pred(
       installer_state.target_path().Append(kChromeExe));
   string16 client_open_path;
   RegKey client_open_key;
   string16 reg_exe;
   for (RegistryKeyIterator iter(root, ShellUtil::kRegStartMenuInternet);
        iter.Valid(); ++iter) {
     client_open_path.assign(ShellUtil::kRegStartMenuInternet)
         .append(1, L'\\')
         .append(iter.Name())
         .append(ShellUtil::kRegShellOpen);
@@ skipping 319 matching lines @@
 
   // Delete Software\Classes\Chrome (Same comment as above applies for this too)
   string16 chrome_app_id(ShellUtil::kRegClasses);
   chrome_app_id.push_back(FilePath::kSeparators[0]);
   chrome_app_id.append(dist->GetBrowserAppId());
   InstallUtil::DeleteRegistryKey(root, chrome_app_id);
 
   // Delete all Start Menu Internet registrations that refer to this Chrome.
   {
     using base::win::RegistryKeyIterator;
-    ProgramCompare open_command_pred(chrome_exe);
+    InstallUtil::ProgramCompare open_command_pred(chrome_exe);
     string16 client_name;
     string16 client_key;
     string16 open_key;
     for (RegistryKeyIterator iter(root, ShellUtil::kRegStartMenuInternet);
          iter.Valid(); ++iter) {
       client_name.assign(iter.Name());
       client_key.assign(ShellUtil::kRegStartMenuInternet)
           .append(1, L'\\')
           .append(client_name);
       open_key.assign(client_key).append(ShellUtil::kRegShellOpen);
@@ skipping 53 matching lines @@
   // Delete the default value of SOFTWARE\Clients\StartMenuInternet if it
   // references this Chrome.  Do this explicitly here for the case where HKCU is
   // being processed; the iteration above will have no hits since registration
   // lives in HKLM.
   InstallUtil::DeleteRegistryValueIf(
       root, ShellUtil::kRegStartMenuInternet, L"",
       InstallUtil::ValueEquals(dist->GetApplicationName() +
                                browser_entry_suffix));
 
   // Delete each protocol association if it references this Chrome.
-  ProgramCompare open_command_pred(chrome_exe);
+  InstallUtil::ProgramCompare open_command_pred(chrome_exe);
   string16 parent_key(ShellUtil::kRegClasses);
   const string16::size_type base_length = parent_key.size();
   string16 child_key;
   for (const wchar_t* const* proto =
            &ShellUtil::kPotentialProtocolAssociations[0];
        *proto != NULL;
        ++proto) {
     parent_key.resize(base_length);
     parent_key.push_back(FilePath::kSeparators[0]);
     parent_key.append(*proto);
@@ skipping 298 matching lines @@
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!backup_state_file.empty())
     file_util::Delete(backup_state_file, false);
 
   return ret;
 }
 
 }  // namespace installer