Remove multi-install from install_static.

chrome/install_static/install_util_unittest.cc

 // Copyright 2016 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 "chrome/install_static/install_util.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 249 matching lines @@
 }
 
 TEST(InstallStaticTest, BrowserProcessTest) {
   EXPECT_EQ(ProcessType::UNINITIALIZED, g_process_type);
   InitializeProcessType();
   EXPECT_FALSE(IsNonBrowserProcess());
 }
 
 class InstallStaticUtilTest
     : public ::testing::TestWithParam<
-          std::tuple<InstallConstantIndex, const char*, const char*>> {
+          std::tuple<InstallConstantIndex, const char*>> {
  protected:
   InstallStaticUtilTest() {
     InstallConstantIndex mode_index;
     const char* level;
-    const char* mode;
 
-    std::tie(mode_index, level, mode) = GetParam();
+    std::tie(mode_index, level) = GetParam();
 
     mode_ = &kInstallModes[mode_index];
     system_level_ = std::string(level) != "user";
     EXPECT_TRUE(!system_level_ || mode_->supports_system_level);
-    multi_install_ = std::string(mode) != "single";
-    EXPECT_TRUE(!multi_install_ || mode_->supports_multi_install);
     root_key_ = system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
     nt_root_key_ = system_level_ ? nt::HKLM : nt::HKCU;
 
     std::unique_ptr<PrimaryInstallDetails> details =
         base::MakeUnique<PrimaryInstallDetails>();
     details->set_mode(mode_);
     details->set_channel(mode_->default_channel_name);
     details->set_system_level(system_level_);
-    details->set_multi_install(multi_install_);
     InstallDetails::SetForProcess(std::move(details));
 
     base::string16 path;
     override_manager_.OverrideRegistry(root_key_, &path);
     nt::SetTestingOverride(nt_root_key_, path);
   }
 
   ~InstallStaticUtilTest() {
     InstallDetails::SetForProcess(nullptr);
     nt::SetTestingOverride(nt_root_key_, base::string16());
   }
 
   bool system_level() const { return system_level_; }
 
-  bool multi_install() const { return multi_install_; }
-
   const wchar_t* default_channel() const { return mode_->default_channel_name; }
 
   void SetUsageStat(DWORD value, bool medium) {
     ASSERT_TRUE(!medium || system_level_);
     ASSERT_EQ(ERROR_SUCCESS,
               base::win::RegKey(root_key_, GetUsageStatsKeyPath(medium).c_str(),
                                 KEY_SET_VALUE | KEY_WOW64_32KEY)
                   .WriteValue(L"usagestats", value));
   }
 
@@ skipping 15 matching lines @@
   // value. |medium| = true returns the path for ClientStateMedium.
   std::wstring GetUsageStatsKeyPath(bool medium) {
     EXPECT_TRUE(!medium || system_level_);
 
     std::wstring result(L"Software\\");
     if (kUseGoogleUpdateIntegration) {
       result.append(L"Google\\Update\\ClientState");
       if (medium)
         result.append(L"Medium");
       result.push_back(L'\\');
-      if (multi_install_)
-        result.append(kBinariesAppGuid);
-      else
-        result.append(mode_->app_guid);
-    } else if (multi_install_) {
-      result.append(kBinariesPathName);
+      result.append(mode_->app_guid);
     } else {
       result.append(kProductPathName);
     }
     return result;
   }
 
   registry_util::RegistryOverrideManager override_manager_;
   HKEY root_key_ = nullptr;
   nt::ROOT_KEY nt_root_key_ = nt::AUTO;
   const InstallConstants* mode_ = nullptr;
   bool system_level_ = false;
-  bool multi_install_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(InstallStaticUtilTest);
 };
 
 TEST_P(InstallStaticUtilTest, UsageStatsAbsent) {
   EXPECT_FALSE(GetCollectStatsConsent());
 }
 
 TEST_P(InstallStaticUtilTest, UsageStatsZero) {
   SetUsageStat(0, false);
@@ skipping 44 matching lines @@
   SetMetricsReportingPolicy(1);
   SetUsageStat(0, false);
   EXPECT_TRUE(GetCollectStatsConsent());
 
   SetMetricsReportingPolicy(0);
   SetUsageStat(1, false);
   EXPECT_FALSE(GetCollectStatsConsent());
 }
 
 TEST_P(InstallStaticUtilTest, GetChromeChannelName) {
-  EXPECT_EQ(default_channel(), GetChromeChannelName(false));
-  std::wstring expected = default_channel();
-  if (multi_install()) {
-    if (expected.empty())
-      expected = L"m";
-    else
-      expected += L"-m";
-  }
-  EXPECT_EQ(expected, GetChromeChannelName(true));
+  EXPECT_EQ(default_channel(), GetChromeChannelName());
 }
 
 #if defined(GOOGLE_CHROME_BUILD)
-// Stable supports multi-install at user and system levels.
+// Stable user and system levels.

[huangs, 2017/01/03 05:35:14]

s/Stable/Stable supports/  to match line 429 below?

[grt (UTC plus 2), 2017/01/03 15:47:57]

Done.

 INSTANTIATE_TEST_CASE_P(Stable,
                         InstallStaticUtilTest,
                         testing::Combine(testing::Values(STABLE_INDEX),
-                                         testing::Values("user", "system"),
-                                         testing::Values("single", "multi")));
-// Canary is single-only at user level.
+                                         testing::Values("user", "system")));
+// Canary is only at user level.
 INSTANTIATE_TEST_CASE_P(Canary,
                         InstallStaticUtilTest,
                         testing::Combine(testing::Values(CANARY_INDEX),
-                                         testing::Values("user"),
-                                         testing::Values("single")));
+                                         testing::Values("user")));
 #else   // GOOGLE_CHROME_BUILD
-// Chromium supports multi-install at user and system levels.
+// Chromium supports user and system levels.
 INSTANTIATE_TEST_CASE_P(Chromium,
                         InstallStaticUtilTest,
                         testing::Combine(testing::Values(CHROMIUM_INDEX),
-                                         testing::Values("user", "system"),
-                                         testing::Values("single", "multi")));
+                                         testing::Values("user", "system")));
 #endif  // !GOOGLE_CHROME_BUILD
 
 }  // namespace install_static