Remove multi-install from install_static.

chrome/install_static/product_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/product_install_details.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
@@ skipping 167 matching lines @@
     nt::SetTestingOverride(nt_root_key_, path);
   }
 
   ~MakeProductDetailsTest() {
     nt::SetTestingOverride(nt_root_key_, base::string16());
   }
 
   const TestData& test_data() const { return test_data_; }
 
   void SetUninstallArguments(const wchar_t* value) {
-    ASSERT_THAT(
-        base::win::RegKey(root_key_, GetClientStateKeyPath(false).c_str(),
-                          KEY_WOW64_32KEY | KEY_SET_VALUE)
-            .WriteValue(L"UninstallArguments", value),
-        Eq(ERROR_SUCCESS));
+    ASSERT_THAT(base::win::RegKey(root_key_, GetClientStateKeyPath().c_str(),
+                                  KEY_WOW64_32KEY | KEY_SET_VALUE)
+                    .WriteValue(L"UninstallArguments", value),
+                Eq(ERROR_SUCCESS));
   }
 
-  void SetAp(const wchar_t* value, bool binaries) {
-    ASSERT_TRUE(!binaries ||
-                kInstallModes[test_data().index].supports_multi_install);
-    ASSERT_THAT(
-        base::win::RegKey(root_key_, GetClientStateKeyPath(binaries).c_str(),
-                          KEY_WOW64_32KEY | KEY_SET_VALUE)
-            .WriteValue(L"ap", value),
-        Eq(ERROR_SUCCESS));
+  void SetAp(const wchar_t* value) {
+    ASSERT_THAT(base::win::RegKey(root_key_, GetClientStateKeyPath().c_str(),
+                                  KEY_WOW64_32KEY | KEY_SET_VALUE)
+                    .WriteValue(L"ap", value),
+                Eq(ERROR_SUCCESS));
   }
 
  private:
   // Returns the registry path for the product's ClientState key.
-  std::wstring GetClientStateKeyPath(bool binaries) {
-    EXPECT_TRUE(!binaries ||
-                kInstallModes[test_data().index].supports_multi_install);
+  std::wstring GetClientStateKeyPath() {
     std::wstring result(L"Software\\");
     if (kUseGoogleUpdateIntegration) {
       result.append(L"Google\\Update\\ClientState\\");
-      if (binaries)
-        result.append(kBinariesAppGuid);
-      else
-        result.append(kInstallModes[test_data().index].app_guid);
-    } else if (binaries) {
-      result.append(kBinariesPathName);
+      result.append(kInstallModes[test_data().index].app_guid);
     } else {
       result.append(kProductPathName);
     }
     return result;
   }
 
   registry_util::RegistryOverrideManager override_manager_;
   const TestData& test_data_;
   HKEY root_key_;
   nt::ROOT_KEY nt_root_key_;
@@ skipping 15 matching lines @@
   EXPECT_THAT(details->system_level(), Eq(test_data().system_level));
 }
 
 // Test that the default channel is sniffed properly based on the path.
 TEST_P(MakeProductDetailsTest, DefaultChannel) {
   std::unique_ptr<PrimaryInstallDetails> details(
       MakeProductDetails(test_data().path));
   EXPECT_THAT(details->channel(), StrEq(test_data().channel));
 }
 
-// Test that multi-install is properly parsed out of the registry.
-TEST_P(MakeProductDetailsTest, MultiInstall) {
-  {
-    std::unique_ptr<PrimaryInstallDetails> details(
-        MakeProductDetails(test_data().path));
-    EXPECT_FALSE(details->multi_install());
-  }
-
-  {
-    SetUninstallArguments(L"--uninstall");
-    std::unique_ptr<PrimaryInstallDetails> details(
-        MakeProductDetails(test_data().path));
-    EXPECT_FALSE(details->multi_install());
-  }
-
-  if (!kInstallModes[test_data().index].supports_multi_install)
-    return;
-
-  {
-    SetUninstallArguments(L"--uninstall --multi-install --chrome");
-    std::unique_ptr<PrimaryInstallDetails> details(
-        MakeProductDetails(test_data().path));
-    EXPECT_TRUE(details->multi_install());
-  }
-}
-
 // Test that the channel name is properly parsed out of additional parameters.
 TEST_P(MakeProductDetailsTest, AdditionalParametersChannels) {
   const std::pair<const wchar_t*, const wchar_t*> kApChannels[] = {
       // stable
       {L"", L""},
       {L"-full", L""},
       {L"x64-stable", L""},
       {L"x64-stable-full", L""},
       {L"baz-x64-stable", L""},
       {L"foo-1.1-beta", L""},
       {L"2.0-beta", L""},
       {L"bar-2.0-dev", L""},
       {L"1.0-dev", L""},
       {L"fuzzy", L""},
       {L"foo", L""},
       {L"-multi-chrome", L""},

[huangs, 2016/12/27 20:04:23]

Address these?  So maybe remove.  Alternatively, add "// Legacy", and add
"-multi-install" as test case?

[grt (UTC plus 2), 2017/01/02 12:58:45]

There will still be clients with "-multi" in their "ap" values, so these are
still valid test cases. Will add // Legacy.

       {L"x64-stable-multi-chrome", L""},
       {L"-stage:ensemble_patching-multi-chrome-full", L""},
       {L"-multi-chrome-full", L""},
       // beta
       {L"1.1-beta", L"beta"},
       {L"1.1-beta-full", L"beta"},
       {L"x64-beta", L"beta"},
       {L"x64-beta-full", L"beta"},
       {L"1.1-bar", L"beta"},
       {L"1n1-foobar", L"beta"},
       {L"x64-Beta", L"beta"},
       {L"bar-x64-beta", L"beta"},
       // dev
       {L"2.0-dev", L"dev"},
       {L"2.0-dev-full", L"dev"},
       {L"x64-dev", L"dev"},
       {L"x64-dev-full", L"dev"},
       {L"2.0-DEV", L"dev"},
       {L"2.0-dev-eloper", L"dev"},
       {L"2.0-doom", L"dev"},
       {L"250-doom", L"dev"},
   };
 
   for (const auto& ap_and_channel : kApChannels) {
-    SetAp(ap_and_channel.first, false);
+    SetAp(ap_and_channel.first);
     std::unique_ptr<PrimaryInstallDetails> details(
         MakeProductDetails(test_data().path));
     if (kInstallModes[test_data().index].channel_strategy ==
-        ChannelStrategy::ADDITIONAL_PARAMETERS) {
-      EXPECT_THAT(details->channel(), StrEq(ap_and_channel.second));
-    } else {
-      // "ap" is ignored for this mode.
-      EXPECT_THAT(details->channel(), StrEq(test_data().channel));
-    }
-  }
-
-  if (!kInstallModes[test_data().index].supports_multi_install)
-    return;
-
-  // For multi-install modes, "ap" is pulled from the binaries' key.
-  for (const auto& ap_and_channel : kApChannels) {
-    SetAp(ap_and_channel.first, true);
-    SetUninstallArguments(L"--uninstall --multi-install --chrome");
-    std::unique_ptr<PrimaryInstallDetails> details(
-        MakeProductDetails(test_data().path));
-    if (kInstallModes[test_data().index].channel_strategy ==
         ChannelStrategy::ADDITIONAL_PARAMETERS) {
       EXPECT_THAT(details->channel(), StrEq(ap_and_channel.second));
     } else {
       // "ap" is ignored for this mode.
       EXPECT_THAT(details->channel(), StrEq(test_data().channel));
     }
   }
 }
 
 INSTANTIATE_TEST_CASE_P(All,
                         MakeProductDetailsTest,
                         testing::ValuesIn(kTestData));
 
 }  // namespace install_static