Read multi-install chrome's channel from the binaries.

chrome/installer/util/google_update_settings_unittest.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.
 
 #include <windows.h>
 #include <shlwapi.h>  // For SHDeleteKey.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
@@ skipping 36 matching lines @@
     HKEY root = is_system == SYSTEM_INSTALL ?
         HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
 
     RegKey update_key;
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     std::wstring path = dist->GetStateKey();
     ASSERT_EQ(ERROR_SUCCESS, update_key.Create(root, path.c_str(), KEY_WRITE));
     ASSERT_EQ(ERROR_SUCCESS, update_key.WriteValue(L"ap", value));
   }
 
+  // Sets the "ap" field for a multi-install product (both the product and
+  // the binaries).
+  void SetMultiApField(SystemUserInstall is_system, const wchar_t* value) {
+    // Caller must specify a multi-install ap value.
+    ASSERT_NE(std::wstring::npos, std::wstring(value).find(L"-multi"));
+    HKEY root = is_system == SYSTEM_INSTALL ?
+        HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+    RegKey update_key;
+
+    // Write the ap value for both the product and the binaries.
+    BrowserDistribution* const kDists[] = {
+      BrowserDistribution::GetDistribution(),
+      BrowserDistribution::GetSpecificDistribution(
+          BrowserDistribution::CHROME_BINARIES)
+    };
+    for (size_t i = 0; i < arraysize(kDists); ++i) {
+      std::wstring path = kDists[i]->GetStateKey();
+      ASSERT_EQ(ERROR_SUCCESS, update_key.Create(root, path.c_str(),
+                                                 KEY_WRITE));
+      ASSERT_EQ(ERROR_SUCCESS, update_key.WriteValue(L"ap", value));
+    }
+
+    // Make the product technically multi-install.
+    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+    ASSERT_EQ(ERROR_SUCCESS,
+              update_key.Create(root, dist->GetStateKey().c_str(), KEY_WRITE));
+    ASSERT_EQ(ERROR_SUCCESS,
+              update_key.WriteValue(installer::kUninstallArgumentsField,
+                                    L"--multi-install"));
+  }
+
   // Tests setting the ap= value to various combinations of values with
   // prefixes and suffixes, while asserting on the correct channel value.
   // Note that any non-empty ap= value that doesn't match ".*-{dev|beta}.*"
   // will return the "unknown" channel.
   void TestCurrentChromeChannelWithVariousApValues(SystemUserInstall install) {
     static struct Expectations {
       const wchar_t* ap_value;
       const wchar_t* channel;
     } expectations[] = {
       { L"dev", installer::kChromeChannelDev },
@@ skipping 236 matching lines @@
   EXPECT_TRUE(GoogleUpdateSettings::GetChromeChannelAndModifiers(true,
                                                                  &channel));
   EXPECT_STREQ(L"", channel.c_str());
 
   // Per-user lookup should succeed.
   EXPECT_TRUE(GoogleUpdateSettings::GetChromeChannelAndModifiers(false,
                                                                  &channel));
   EXPECT_STREQ(L"", channel.c_str());
 }
 
+// Test that the channel is pulled from the binaries for multi-install products.
+TEST_F(GoogleUpdateSettingsTest, MultiInstallChannelFromBinaries) {
+  SetMultiApField(USER_INSTALL, L"2.0-dev-multi");
+  base::string16 channel;
+
+  EXPECT_TRUE(GoogleUpdateSettings::GetChromeChannelAndModifiers(false,
+                                                                 &channel));
+  EXPECT_STREQ(L"dev-m", channel.c_str());
+
+  // See if the same happens if the product's ap is cleared.
+  SetApField(USER_INSTALL, L"");
+  EXPECT_TRUE(GoogleUpdateSettings::GetChromeChannelAndModifiers(false,
+                                                                 &channel));
+  EXPECT_STREQ(L"dev-m", channel.c_str());

[robertshield, 2014/06/04 21:10:14]

optional: test also that a non-empty value for the chrome product and an empty
value for the multi, the multi still wins. 

[grt (UTC plus 2), 2014/06/04 21:15:36]

Done.

+}
+
 TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelVariousApValuesSystem) {
   TestCurrentChromeChannelWithVariousApValues(SYSTEM_INSTALL);
 }
 
 TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelVariousApValuesUser) {
   TestCurrentChromeChannelWithVariousApValues(USER_INSTALL);
 }
 
 // Run through all combinations of diff vs. full install, single vs. multi
 // install, success and failure results, and a fistful of initial "ap" values
@@ skipping 846 matching lines @@
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::FALSE_SETTING, StatsState::FALSE_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::FALSE_SETTING, StatsState::TRUE_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::TRUE_SETTING, StatsState::NO_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::TRUE_SETTING, StatsState::FALSE_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::TRUE_SETTING, StatsState::TRUE_SETTING)));