[Chrome ELF] New NT registry API.

chrome/browser/chrome_elf_init_win.cc

 // Copyright 2014 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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
@@ skipping 111 matching lines @@
   // No point in trying to continue if the registry key isn't valid.
   if (!finch_blacklist_registry_key.Valid())
     return;
 
   // Delete and recreate the key to clear the registry.
   finch_blacklist_registry_key.DeleteKey(L"");
   finch_blacklist_registry_key.Create(
       HKEY_CURRENT_USER, blacklist::kRegistryFinchListPath, KEY_SET_VALUE);
 
   std::map<std::string, std::string> params;
-  variations::GetVariationParams(kBrowserBlacklistTrialName, &params);
+  std::string value = variations::GetVariationParamValue(
+      kBrowserBlacklistTrialName, blacklist::kRegistryFinchListValueNameStr);
+  if (value.empty())
+    return;
+  std::wstring value_wcs = base::UTF8ToWide(value);

[robertshield, 2016/04/20 05:16:09]

prefer base::string16

[penny, 2016/05/28 01:34:22]

Done.  This base API explicitly returns a std::wstring, so that's what I was
using.  Also, it's converted from a std::string type, so it seemed cleaner to
match them.  I'm happy to make this base::string16 though, if you think it's
better here.

 
-  for (std::map<std::string, std::string>::iterator it = params.begin();
-       it != params.end();
-       ++it) {
-    std::wstring name = base::UTF8ToWide(it->first);
-    std::wstring val = base::UTF8ToWide(it->second);
+  // The dll names are comma-separated in this param value.  We need to turn
+  // this into REG_MULTI_SZ format (double-null terminates).
+  // Note that the strings are wide character in registry.
+  std::vector<wchar_t> reg_buffer(value_wcs.begin(), value_wcs.end());

[robertshield, 2016/04/20 05:16:09]

I'm not sure you need to copy the dll names here. std::wstrings can contain
embedded null chars (with minimal gotchas, none of which apply to the code
below).

[penny, 2016/05/28 01:34:22]

Done.  TIL!  I didn't know you could embed null chars in a std::string  (and
still get the right size, etc).  Thanks! 

+  reg_buffer.push_back(L'\0');
+  reg_buffer.push_back(L'\0');
+  std::replace(reg_buffer.begin(), reg_buffer.end(), L',', L'\0');
 
-    finch_blacklist_registry_key.WriteValue(name.c_str(), val.c_str());
-  }
+  finch_blacklist_registry_key.WriteValue(
+      blacklist::kRegistryFinchListValueName, reg_buffer.data(),
+      (reg_buffer.size() * sizeof(wchar_t)), REG_MULTI_SZ);
 }
 
 void BrowserBlacklistBeaconSetup() {
   base::win::RegKey blacklist_registry_key(HKEY_CURRENT_USER,
                                            blacklist::kRegistryBeaconPath,
                                            KEY_QUERY_VALUE | KEY_SET_VALUE);
 
   // No point in trying to continue if the registry key isn't valid.
   if (!blacklist_registry_key.Valid())
     return;
@@ skipping 47 matching lines @@
 
     blacklist_registry_key.WriteValue(blacklist::kBeaconAttemptCount,
                                       static_cast<DWORD>(0));
 
     // Only report the blacklist as getting setup when both registry writes
     // succeed, since otherwise the blacklist wasn't properly setup.
     if (set_version == ERROR_SUCCESS && set_state == ERROR_SUCCESS)
       RecordBlacklistSetupEvent(BLACKLIST_SETUP_ENABLED);
   }
 }