Give SxS distribution its own registration GUIDs.

win8/delegate_execute/chrome_util.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.
 
 #include "win8/delegate_execute/chrome_util.h"
 
 #include <windows.h>
 #include <atlbase.h>
 #include <shlobj.h>
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/md5.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/win_util.h"
+#include "chrome/installer/util/install_util.h"
 #include "google_update/google_update_idl.h"
 
 namespace {
 
 #if defined(GOOGLE_CHROME_BUILD)
-const wchar_t kAppUserModelId[] = L"Chrome";
-#else  // GOOGLE_CHROME_BUILD
-const wchar_t kAppUserModelId[] = L"Chromium";
-#endif  // GOOGLE_CHROME_BUILD
-
-#if defined(GOOGLE_CHROME_BUILD)
 
 // TODO(grt): These constants live in installer_util.  Consider moving them

[grt (UTC plus 2), 2013/09/04 03:33:36]

how many of these constants can be replaced with corresponding items in
chrome/installer/util/util_constants.h?

[zturner, 2013/09/05 01:35:29]

I was only able to replace one constant, the one for the return code.  The rest
do not seem to exist anywhere else.  Hopefully I didn't miss anything too
obvious.

 // into common_constants to allow for reuse.
 const base::FilePath::CharType kNewChromeExe[] =
     FILE_PATH_LITERAL("new_chrome.exe");
 const wchar_t kRenameCommandValue[] = L"cmd";
 const wchar_t kChromeAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
 const wchar_t kRegPathChromeClient[] =
     L"Software\\Google\\Update\\Clients\\"
     L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
 const int kExitCodeRenameSuccessful = 23;
 
@@ skipping 199 matching lines @@
       AtlTrace("%hs. Failed to finalize update with exit code %d.\n",
                __FUNCTION__, exit_code);
     } else {
       AtlTrace("%hs. Finalized pending update.\n", __FUNCTION__);
     }
   }
 #endif
 }
 
 // TODO(gab): This code also lives in shell_util. Refactor for reuse.
 string16 GetAppId(const base::FilePath& chrome_exe) {

[gab, 2013/09/03 21:05:19]

All calls to this can be replaced by ShellUtil::GetBrowserModelId().

The extra complexity in there is:
1) Command-line stuff for the installer; will no matter for delegate_execute and
be a no-op.
2) Use the BuildAppModelId to finish the final value; this is not really
necessary for this path (hence why I didn't copy that logic here I guess), but
it is not wrong to go with the generic code and call it anyways...

To respond to your comment; the current method is also building something at
runtime (i.e. appending a constant and the
user-specific-runtime-generated-suffix); they will have the same results for
this code path.

[zturner, 2013/09/05 01:35:29]

Done.

-  string16 app_id(kAppUserModelId);
+  string16 app_id(InstallUtil::GetAppUserModelId());
   string16 suffix;
   if (IsPerUserInstall(chrome_exe) &&
       !GetUserSpecificRegistrySuffix(&suffix)) {
     AtlTrace("%hs. GetUserSpecificRegistrySuffix failed.\n",
               __FUNCTION__);
   }
   return app_id.append(suffix);
 }
 
 }  // delegate_execute