Factor out logic to find chrome.exe from Omaha client state.

chrome/installer/gcapi/gcapi.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.
 
 // NOTE: This code is a legacy utility API for partners to check whether
 //       Chrome can be installed and launched. Recent updates are being made
 //       to add new functionality. These updates use code from Chromium, the old
 //       coded against the win32 api directly. If you have an itch to shave a
 //       yak, feel free to re-write the old code too.
 
@@ skipping 13 matching lines @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
+#include "chrome/tools/launcher_support/chrome_launcher_support.h"

[Vitaly Buka (NO REVIEWS), 2012/06/13 18:01:36]

invalid order

[robertshield, 2012/06/13 18:01:53]

move this include down to line 39

[erikwright (departed), 2012/06/13 19:43:43]

Done.

[erikwright (departed), 2012/06/13 19:43:43]

Done.

 #include "chrome/installer/gcapi/gcapi_omaha_experiment.h"
 #include "chrome/installer/gcapi/gcapi_reactivation.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/util_constants.h"
 #include "google_update/google_update_idl.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::win::RegKey;
 using base::win::ScopedCOMInitializer;
@@ skipping 322 matching lines @@
   HKEY install_key = HKEY_LOCAL_MACHINE;
   if (!IsChromeInstalled(install_key)) {
     install_key = HKEY_CURRENT_USER;
     if (!IsChromeInstalled(install_key)) {
       return false;
     }
   }
 
   // Now grab the uninstall string from the appropriate ClientState key
   // and use that as the base for a path to chrome.exe.
-  FilePath chrome_exe_path;
-  RegKey client_state(install_key, kChromeRegClientStateKey, KEY_QUERY_VALUE);
-  if (client_state.Valid()) {
-    std::wstring uninstall_string;
-    if (client_state.ReadValue(installer::kUninstallStringField,
-                               &uninstall_string) == ERROR_SUCCESS) {
-      // The uninstall path contains the path to setup.exe which is two levels
-      // down from chrome.exe. Move up two levels (plus one to drop the file
-      // name) and look for chrome.exe from there.
-      FilePath uninstall_path(uninstall_string);
-      chrome_exe_path = uninstall_path.DirName()
-                                      .DirName()
-                                      .DirName()
-                                      .Append(installer::kChromeExe);
-      if (!file_util::PathExists(chrome_exe_path)) {
-        // By way of mild future proofing, look up one to see if there's a
-        // chrome.exe in the version directory
-        chrome_exe_path =
-            uninstall_path.DirName().DirName().Append(installer::kChromeExe);
-      }
-    }
-  }
-
-  if (!file_util::PathExists(chrome_exe_path)) {
+  FilePath chrome_exe_path = chrome_launcher_support::GetAnyChromePath();

[robertshield, 2012/06/13 18:01:53]

prefer constructor syntax

[erikwright (departed), 2012/06/13 19:43:43]

Done.

+  if (chrome_exe_path.empty()) {
     return false;
   }
 
   ScopedCOMInitializer com_initializer;
   if (::CoInitializeSecurity(NULL, -1, NULL, NULL,
                              RPC_C_AUTHN_LEVEL_PKT_PRIVACY,
                              RPC_C_IMP_LEVEL_IDENTIFY, NULL,
                              EOAC_DYNAMIC_CLOAKING, NULL) != S_OK) {
     return false;
   }
@@ skipping 202 matching lines @@
       result = TRUE;
     } else {
       if (error_code)
         *error_code = REACTIVATE_ERROR_REACTIVATION_FAILED;
     }
   }
 
   return result;
 }