Give SxS distribution its own registration GUIDs.

chrome/installer/util/install_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.
 //
 // See the corresponding header file for description of the functions in this
 // file.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <shellapi.h>
@@ skipping 347 matching lines @@
   CHECK(command_line);
 
   if (command_line->HasSwitch(installer::switches::kChromeSxS))
     return true;
 
   // Also return true if we are running from Chrome SxS installed path.
   base::FilePath exe_dir;
   PathService::Get(base::DIR_EXE, &exe_dir);
   string16 chrome_sxs_dir(installer::kGoogleChromeInstallSubDir2);
   chrome_sxs_dir.append(installer::kSxSSuffix);
-  return base::FilePath::CompareEqualIgnoreCase(
-          exe_dir.BaseName().value(), installer::kInstallBinaryDir) &&
-      base::FilePath::CompareEqualIgnoreCase(
-          exe_dir.DirName().BaseName().value(), chrome_sxs_dir);
+
+  // This is SxS if current EXE is in or under (possibly multiple levels under)
+  // |chrome_sxs_dir|\|installer::kInstallBinaryDir|
+  typedef std::vector<base::FilePath::StringType>::const_reverse_iterator

[gab, 2013/09/11 21:26:29]

I would put the typedef right before the for loop since it's only used for it.

+      ComponentsIterator;
+  std::vector<base::FilePath::StringType> components;
+  exe_dir.GetComponents(&components);
+  for (ComponentsIterator current = components.rbegin(), parent = current+1;

[gab, 2013/09/11 21:26:29]

Need to check:

if (components.size() < 2)
  return false;

before doing this or current+1 might not exist if current == rend().

Technically checking !components.empty() is sufficient to ensure that, but if
checking size, might as well check that it's not < 2 in which case we can't
succeed anyways...

[gab, 2013/09/11 21:26:29]

Spaces on each side of '+' sign.

+       parent != components.rend(); current = parent++) {
+    if (base::FilePath::CompareEqualIgnoreCase(*current,

[grt (UTC plus 2), 2013/09/11 21:39:34]

move *current to next line as was done in uninstall.cc (indented four spaces
from the 'b' in "base::FilePath")?

+        installer::kInstallBinaryDir)) {
+      if (base::FilePath::CompareEqualIgnoreCase(*parent, chrome_sxs_dir))

[gab, 2013/09/11 21:26:29]

Use && instead of nesting ifs.

+        return true;
+    }
+  }
+
+  return false;
 }
 
 bool InstallUtil::IsChromeSxSProcess() {
   static bool sxs = CheckIsChromeSxSProcess();
   return sxs;
 }
 
 bool InstallUtil::GetSentinelFilePath(const base::FilePath::CharType* file,
                                       BrowserDistribution* dist,
                                       base::FilePath* path) {
@@ skipping 221 matching lines @@
   // Open the program and see if it references the expected file.
   base::win::ScopedHandle handle;
   BY_HANDLE_FILE_INFORMATION info = {};
 
   return (OpenForInfo(path, &handle) &&
           GetInfo(handle, &info) &&
           info.dwVolumeSerialNumber == file_info_.dwVolumeSerialNumber &&
           info.nFileIndexHigh == file_info_.nFileIndexHigh &&
           info.nFileIndexLow == file_info_.nFileIndexLow);
 }