Revert 82686 - Extend PathService::Get to be able to return the X86 program files path.Cloud print's virtual driver needs this to be able to find the Chrome install directory. Since the port monitor is a 64 bit DLL on 64 bit Windows it needs to request the X86 folder explicitly.BUG=TEST=Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=82567Review URL: http://codereview.chromium.org/6873159

TBR=abodenha@chromium.org
Review URL: http://codereview.chromium.org/6880147

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82699 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 1 deletions

diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
index 05c5272..450ef56 100644
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
@@ -273,7 +273,16 @@ bool GetChromeExePath(FilePath* chrome_path) {
 
   // Chrome doesn't appear to be installed per user.
   // Now check %programfiles(x86)%\google\chrome\application
-  PathService::Get(base::DIR_PROGRAM_FILESX86, &path);
+  // TODO(abodenha@chromium.org) Extend PathService::Get to be able to
+  // return the X86 program files path.  At a minimum, use SHGetKnownFolderPath
+  // instead.
+  wchar_t system_buffer[MAX_PATH] = L"";
+  SHGetFolderPath(NULL,
+                  CSIDL_PROGRAM_FILESX86,
+                  NULL,
+                  SHGFP_TYPE_CURRENT,
+                  system_buffer);
+  path = FilePath(system_buffer);
   path = path.Append(kChromeExePath);
   if (file_util::PathExists(path)) {
     *chrome_path = FilePath(path.value());