Move ProgramCompare from setup_util to install_util.

chrome/installer/setup/setup_util.h

Index: chrome/installer/setup/setup_util.h
diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h
index 9bb03949b169304748c795d45a782227327cb1be..99b746130cc5b66e25f9221f86d7f17b12b590e5 100644
--- a/chrome/installer/setup/setup_util.h
+++ b/chrome/installer/setup/setup_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 //
@@ -10,8 +10,6 @@
 
 #include "base/file_path.h"
 #include "base/version.h"
-#include "base/win/scoped_handle.h"
-#include "chrome/installer/util/install_util.h"
 
 namespace installer {
 
@@ -41,30 +39,6 @@ Version* GetMaxVersionFromArchiveDir(const FilePath& chrome_path);
 bool DeleteFileFromTempProcess(const FilePath& path,
                                uint32 delay_before_delete_ms);
 
-// A predicate that compares the program portion of a command line with a given
-// file path.  First, the file paths are compared directly.  If they do not
-// match, the filesystem is consulted to determine if the paths reference the
-// same file.
-class ProgramCompare : public InstallUtil::RegistryValuePredicate {
- public:
-  explicit ProgramCompare(const FilePath& path_to_match);
-  virtual ~ProgramCompare();
-  virtual bool Evaluate(const std::wstring& value) const OVERRIDE;
-
- protected:
-  static bool OpenForInfo(const FilePath& path,
-                          base::win::ScopedHandle* handle);
-  static bool GetInfo(const base::win::ScopedHandle& handle,
-                      BY_HANDLE_FILE_INFORMATION* info);
-
-  FilePath path_to_match_;
-  base::win::ScopedHandle file_handle_;
-  BY_HANDLE_FILE_INFORMATION file_info_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ProgramCompare);
-};  // class ProgramCompare
-
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_SETUP_SETUP_UTIL_H_