Remove multi-install from install_static.

chrome/install_static/install_details_unittest.cc

Index: chrome/install_static/install_details_unittest.cc
diff --git a/chrome/install_static/install_details_unittest.cc b/chrome/install_static/install_details_unittest.cc
index 1627028e5ba6664d923c6f675f22e78365191e0a..f921dfd6f4f841f8ff58a17dd0194988a54c6e93 100644
--- a/chrome/install_static/install_details_unittest.cc
+++ b/chrome/install_static/install_details_unittest.cc
@@ -22,7 +22,7 @@ class FakeInstallDetails : public InstallDetails {
     constants.size = sizeof(constants);
     constants.install_suffix = L"";
     constants.default_channel_name = L"";
-    constants.supports_multi_install = true;
+    constants.supported_multi_install = true;

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

Should there be a test for |supported_multi_install = false|?  Maybe add TODO?

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

There's nothing in InstallDetails that depends on |supported_multi_install|, so
there's nothing to test here. I'll make sure there is test coverage in
https://codereview.chromium.org/2459583002/ (Use InstallDetails in setup) as I
rebase it on top of this.

     if (kUseGoogleUpdateIntegration) {
       constants.app_guid = L"testguid";
       constants.channel_strategy = ChannelStrategy::FIXED;
@@ -57,68 +57,23 @@ class FakeInstallDetails : public InstallDetails {
 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),
-                StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-    EXPECT_THAT(details.GetClientStateKeyPath(true),
+    EXPECT_THAT(details.GetClientStateKeyPath(),
                 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),
-        StrEq(L"Software\\Google\\Update\\ClientStateMedium\\testguid"));
     EXPECT_THAT(
-        details.GetClientStateMediumKeyPath(true),
+        details.GetClientStateMediumKeyPath(),
         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),
-                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),
+    EXPECT_THAT(details.GetClientStateKeyPath(),
                 StrEq(std::wstring(L"Software\\").append(kProductPathName)));
-    EXPECT_THAT(details.GetClientStateKeyPath(true),
-                StrEq(std::wstring(L"Software\\").append(kBinariesPathName)));
   }
 }