Clear the secrets reg key as well as the clients reg key in clearPairedClients.

BUG=325567

Review URL: https://codereview.chromium.org/164183009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251558 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 0 deletions

diff --git a/remoting/host/pairing_registry_delegate_win.cc b/remoting/host/pairing_registry_delegate_win.cc
index 1d7ad31..b4b89b2 100644
--- a/remoting/host/pairing_registry_delegate_win.cc
+++ b/remoting/host/pairing_registry_delegate_win.cc
@@ -149,6 +149,8 @@ bool PairingRegistryDelegateWin::DeleteAll() {
     return false;
   }
 
+  // Enumerate and delete the values in the privileged and unprivileged keys
+  // separately in case they get out of sync.
   bool success = true;
   DWORD count = unprivileged_.GetValueCount();
   while (count > 0) {
@@ -162,6 +164,18 @@ bool PairingRegistryDelegateWin::DeleteAll() {
     count = unprivileged_.GetValueCount();
   }
 
+  count = privileged_.GetValueCount();
+  while (count > 0) {
+    // presubmit: allow wstring
+    std::wstring value_name;
+    LONG result = privileged_.GetValueNameAt(0, &value_name);
+    if (result == ERROR_SUCCESS)
+      result = privileged_.DeleteValue(value_name.c_str());
+
+    success = success && (result == ERROR_SUCCESS);
+    count = privileged_.GetValueCount();
+  }
+
   return success;
 }