Remove multi-install from install_static.

chrome/install_static/install_details_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_details.h"
 
 #include <string>
 
 #include "base/macros.h"
 #include "chrome/install_static/install_modes.h"
 #include "components/version_info/version_info_values.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::StrEq;
 
 namespace install_static {
 
 class FakeInstallDetails : public InstallDetails {
  public:
   FakeInstallDetails() : InstallDetails(&payload) {
     constants.size = sizeof(constants);
     constants.install_suffix = L"";
     constants.default_channel_name = L"";
-    constants.supports_multi_install = true;
+    constants.supported_multi_install = true;
     if (kUseGoogleUpdateIntegration) {
       constants.app_guid = L"testguid";
       constants.channel_strategy = ChannelStrategy::FIXED;
     } else {
       constants.app_guid = L"";
       constants.channel_strategy = ChannelStrategy::UNSUPPORTED;
     }
     payload.size = sizeof(payload);
     payload.product_version = product_version.c_str();
     payload.mode = &constants;
@@ skipping 14 matching lines @@
   std::wstring channel = std::wstring(L"testchannel");
   std::string product_version = std::string(PRODUCT_VERSION);
   Payload payload = Payload();
 
   DISALLOW_COPY_AND_ASSIGN(FakeInstallDetails);
 };
 
 TEST(InstallDetailsTest, GetClientStateKeyPath) {
   FakeInstallDetails details;
   if (kUseGoogleUpdateIntegration) {
-    // Single-install.
-    EXPECT_THAT(details.GetClientStateKeyPath(false),
+    EXPECT_THAT(details.GetClientStateKeyPath(),
                 StrEq(L"Software\\Google\\Update\\ClientState\\testguid"));
-    EXPECT_THAT(details.GetClientStateKeyPath(true),
-                StrEq(L"Software\\Google\\Update\\ClientState\\testguid"));
-
-    // Multi-install.
-    details.payload.multi_install = true;
-    EXPECT_THAT(details.GetClientStateKeyPath(false),
-                StrEq(L"Software\\Google\\Update\\ClientState\\testguid"));
-    EXPECT_THAT(details.GetClientStateKeyPath(true),
-                StrEq(std::wstring(L"Software\\Google\\Update\\ClientState\\")
-                          .append(kBinariesAppGuid)));
   } else {
-    // Single-install.
-    EXPECT_THAT(details.GetClientStateKeyPath(false),
+    EXPECT_THAT(details.GetClientStateKeyPath(),
                 StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-    EXPECT_THAT(details.GetClientStateKeyPath(true),
-                StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-
-    // Multi-install.
-    details.payload.multi_install = true;
-    EXPECT_THAT(details.GetClientStateKeyPath(false),
-                StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-    EXPECT_THAT(details.GetClientStateKeyPath(true),
-                StrEq(std::wstring(L"Software\\").append(kBinariesPathName)));
   }
 }
 
 TEST(InstallDetailsTest, GetClientStateMediumKeyPath) {
   FakeInstallDetails details;
   if (kUseGoogleUpdateIntegration) {
-    // Single-install.
     EXPECT_THAT(
-        details.GetClientStateMediumKeyPath(false),
+        details.GetClientStateMediumKeyPath(),
         StrEq(L"Software\\Google\\Update\\ClientStateMedium\\testguid"));
-    EXPECT_THAT(
-        details.GetClientStateMediumKeyPath(true),
-        StrEq(L"Software\\Google\\Update\\ClientStateMedium\\testguid"));
-
-    // Multi-install.
-    details.payload.multi_install = true;
-    EXPECT_THAT(
-        details.GetClientStateMediumKeyPath(false),
-        StrEq(L"Software\\Google\\Update\\ClientStateMedium\\testguid"));
-    EXPECT_THAT(
-        details.GetClientStateMediumKeyPath(true),
-        StrEq(std::wstring(L"Software\\Google\\Update\\ClientStateMedium\\")
-                  .append(kBinariesAppGuid)));
   } else {
-    // Single-install.
-    EXPECT_THAT(details.GetClientStateKeyPath(false),
+    EXPECT_THAT(details.GetClientStateKeyPath(),
                 StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-    EXPECT_THAT(details.GetClientStateKeyPath(true),
-                StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-
-    // Multi-install.
-    details.payload.multi_install = true;
-    EXPECT_THAT(details.GetClientStateKeyPath(false),
-                StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-    EXPECT_THAT(details.GetClientStateKeyPath(true),
-                StrEq(std::wstring(L"Software\\").append(kBinariesPathName)));
   }
 }
 
 TEST(InstallDetailsTest, VersionMismatch) {
   // All is well to begin with.
   EXPECT_FALSE(FakeInstallDetails().VersionMismatch());
 
   // Bad product version.
   {
     FakeInstallDetails details;
@@ skipping 10 matching lines @@
 
   // Bad InstallConstants size.
   {
     FakeInstallDetails details;
     details.set_mode_size(sizeof(InstallConstants) + 1);
     EXPECT_TRUE(details.VersionMismatch());
   }
 }
 
 }  // namespace install_static