Remove IO thread restrictions from registry functions

base/win/registry.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 "base/win/registry.h"
 
 #include <shlwapi.h>
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 
 #pragma comment(lib, "shlwapi.lib")  // for SHDeleteKey
 
 namespace base {
 namespace win {
 
 // RegKey ----------------------------------------------------------------------
 
 RegKey::RegKey()
     : key_(NULL),
       watch_event_(0) {
 }
 
 RegKey::RegKey(HKEY rootkey, const wchar_t* subkey, REGSAM access)
     : key_(NULL),
       watch_event_(0) {
-  base::ThreadRestrictions::AssertIOAllowed();
   if (rootkey) {
     if (access & (KEY_SET_VALUE | KEY_CREATE_SUB_KEY | KEY_CREATE_LINK))
       Create(rootkey, subkey, access);
     else
       Open(rootkey, subkey, access);
   } else {
     DCHECK(!subkey);
   }
 }
 
 RegKey::~RegKey() {
   Close();
 }
 
 LONG RegKey::Create(HKEY rootkey, const wchar_t* subkey, REGSAM access) {
   DWORD disposition_value;
   return CreateWithDisposition(rootkey, subkey, &disposition_value, access);
 }
 
 LONG RegKey::CreateWithDisposition(HKEY rootkey, const wchar_t* subkey,
                                    DWORD* disposition, REGSAM access) {
-  base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(rootkey && subkey && access && disposition);
   Close();
 
   LONG result = RegCreateKeyEx(rootkey, subkey, 0, NULL,
                                REG_OPTION_NON_VOLATILE, access, NULL, &key_,
                                disposition);
   return result;
 }
 
 LONG RegKey::CreateKey(const wchar_t* name, REGSAM access) {
-  base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(name && access);
-
   HKEY subkey = NULL;
   LONG result = RegCreateKeyEx(key_, name, 0, NULL, REG_OPTION_NON_VOLATILE,
                                access, NULL, &subkey, NULL);
   Close();
 
   key_ = subkey;
   return result;
 }
 
 LONG RegKey::Open(HKEY rootkey, const wchar_t* subkey, REGSAM access) {
-  base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(rootkey && subkey && access);
   Close();
 
   LONG result = RegOpenKeyEx(rootkey, subkey, 0, access, &key_);
   return result;
 }
 
 LONG RegKey::OpenKey(const wchar_t* relative_key_name, REGSAM access) {
-  base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(relative_key_name && access);
-
   HKEY subkey = NULL;
   LONG result = RegOpenKeyEx(key_, relative_key_name, 0, access, &subkey);
 
   // We have to close the current opened key before replacing it with the new
   // one.
   Close();
 
   key_ = subkey;
   return result;
 }
 
 void RegKey::Close() {
-  base::ThreadRestrictions::AssertIOAllowed();
   StopWatching();
   if (key_) {
     ::RegCloseKey(key_);
     key_ = NULL;
   }
 }
 
 bool RegKey::HasValue(const wchar_t* name) const {
-  base::ThreadRestrictions::AssertIOAllowed();
   return RegQueryValueEx(key_, name, 0, NULL, NULL, NULL) == ERROR_SUCCESS;
 }
 
 DWORD RegKey::GetValueCount() const {
-  base::ThreadRestrictions::AssertIOAllowed();
   DWORD count = 0;
   LONG result = RegQueryInfoKey(key_, NULL, 0, NULL, NULL, NULL, NULL, &count,
                                 NULL, NULL, NULL, NULL);
   return (result == ERROR_SUCCESS) ? count : 0;
 }
 
 LONG RegKey::GetValueNameAt(int index, std::wstring* name) const {
-  base::ThreadRestrictions::AssertIOAllowed();
   wchar_t buf[256];
   DWORD bufsize = arraysize(buf);
   LONG r = ::RegEnumValue(key_, index, buf, &bufsize, NULL, NULL, NULL, NULL);
   if (r == ERROR_SUCCESS)
     *name = buf;
 
   return r;
 }
 
 LONG RegKey::DeleteKey(const wchar_t* name) {
-  base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(key_);
   DCHECK(name);
   LONG result = SHDeleteKey(key_, name);
   return result;
 }
 
 LONG RegKey::DeleteValue(const wchar_t* value_name) {
-  base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(key_);
   DCHECK(value_name);
   LONG result = RegDeleteValue(key_, value_name);
   return result;
 }
 
 LONG RegKey::ReadValueDW(const wchar_t* name, DWORD* out_value) const {
   DCHECK(out_value);
   DWORD type = REG_DWORD;
   DWORD size = sizeof(DWORD);
@@ skipping 20 matching lines @@
         size == sizeof(local_value))
       *out_value = local_value;
     else
       result = ERROR_CANTREAD;
   }
 
   return result;
 }
 
 LONG RegKey::ReadValue(const wchar_t* name, std::wstring* out_value) const {
-  base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(out_value);
   const size_t kMaxStringLength = 1024;  // This is after expansion.
   // Use the one of the other forms of ReadValue if 1024 is too small for you.
   wchar_t raw_value[kMaxStringLength];
   DWORD type = REG_SZ, size = sizeof(raw_value);
   LONG result = ReadValue(name, raw_value, &size, &type);
   if (result == ERROR_SUCCESS) {
     if (type == REG_SZ) {
       *out_value = raw_value;
     } else if (type == REG_EXPAND_SZ) {
@@ skipping 13 matching lines @@
     }
   }
 
   return result;
 }
 
 LONG RegKey::ReadValue(const wchar_t* name,
                        void* data,
                        DWORD* dsize,
                        DWORD* dtype) const {
-  base::ThreadRestrictions::AssertIOAllowed();
   LONG result = RegQueryValueEx(key_, name, 0, dtype,
                                 reinterpret_cast<LPBYTE>(data), dsize);
   return result;
 }
 
 LONG RegKey::ReadValues(const wchar_t* name,
                         std::vector<std::wstring>* values) {
-  base::ThreadRestrictions::AssertIOAllowed();
   values->clear();
 
   DWORD type = REG_MULTI_SZ;
   DWORD size = 0;
   LONG result = ReadValue(name, NULL, &size, &type);
   if (FAILED(result) || size == 0)
     return result;
 
   if (type != REG_MULTI_SZ)
     return ERROR_CANTREAD;
@@ skipping 23 matching lines @@
 
 LONG RegKey::WriteValue(const wchar_t * name, const wchar_t* in_value) {
   return WriteValue(name, in_value,
       static_cast<DWORD>(sizeof(*in_value) * (wcslen(in_value) + 1)), REG_SZ);
 }
 
 LONG RegKey::WriteValue(const wchar_t* name,
                         const void* data,
                         DWORD dsize,
                         DWORD dtype) {
-  base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(data || !dsize);
 
   LONG result = RegSetValueEx(key_, name, 0, dtype,
       reinterpret_cast<LPBYTE>(const_cast<void*>(data)), dsize);
   return result;
 }
 
 LONG RegKey::StartWatching() {
   DCHECK(key_);
   if (!watch_event_)
@@ skipping 31 matching lines @@
     watch_event_ = 0;
     result = ERROR_SUCCESS;
   }
   return result;
 }
 
 // RegistryValueIterator ------------------------------------------------------
 
 RegistryValueIterator::RegistryValueIterator(HKEY root_key,
                                              const wchar_t* folder_key) {
-  base::ThreadRestrictions::AssertIOAllowed();
-
   LONG result = RegOpenKeyEx(root_key, folder_key, 0, KEY_READ, &key_);
   if (result != ERROR_SUCCESS) {
     key_ = NULL;
   } else {
     DWORD count = 0;
     result = ::RegQueryInfoKey(key_, NULL, 0, NULL, NULL, NULL, NULL, &count,
                                NULL, NULL, NULL, NULL);
 
     if (result != ERROR_SUCCESS) {
       ::RegCloseKey(key_);
       key_ = NULL;
     } else {
       index_ = count - 1;
     }
   }
 
   Read();
 }
 
 RegistryValueIterator::~RegistryValueIterator() {
-  base::ThreadRestrictions::AssertIOAllowed();
   if (key_)
     ::RegCloseKey(key_);
 }
 
 DWORD RegistryValueIterator::ValueCount() const {
-  base::ThreadRestrictions::AssertIOAllowed();
   DWORD count = 0;
   LONG result = ::RegQueryInfoKey(key_, NULL, 0, NULL, NULL, NULL, NULL,
                                   &count, NULL, NULL, NULL, NULL);
   if (result != ERROR_SUCCESS)
     return 0;
 
   return count;
 }
 
 bool RegistryValueIterator::Valid() const {
   return key_ != NULL && index_ >= 0;
 }
 
 void RegistryValueIterator::operator++() {
   --index_;
   Read();
 }
 
 bool RegistryValueIterator::Read() {
-  base::ThreadRestrictions::AssertIOAllowed();
   if (Valid()) {
     DWORD ncount = arraysize(name_);
     value_size_ = sizeof(value_);
     LONG r = ::RegEnumValue(key_, index_, name_, &ncount, NULL, &type_,
                             reinterpret_cast<BYTE*>(value_), &value_size_);
     if (ERROR_SUCCESS == r)
       return true;
   }
 
   name_[0] = '\0';
   value_[0] = '\0';
   value_size_ = 0;
   return false;
 }
 
 // RegistryKeyIterator --------------------------------------------------------
 
 RegistryKeyIterator::RegistryKeyIterator(HKEY root_key,
                                          const wchar_t* folder_key) {
-  base::ThreadRestrictions::AssertIOAllowed();
   LONG result = RegOpenKeyEx(root_key, folder_key, 0, KEY_READ, &key_);
   if (result != ERROR_SUCCESS) {
     key_ = NULL;
   } else {
     DWORD count = 0;
     LONG result = ::RegQueryInfoKey(key_, NULL, 0, NULL, &count, NULL, NULL,
                                     NULL, NULL, NULL, NULL, NULL);
 
     if (result != ERROR_SUCCESS) {
       ::RegCloseKey(key_);
       key_ = NULL;
     } else {
       index_ = count - 1;
     }
   }
 
   Read();
 }
 
 RegistryKeyIterator::~RegistryKeyIterator() {
-  base::ThreadRestrictions::AssertIOAllowed();
   if (key_)
     ::RegCloseKey(key_);
 }
 
 DWORD RegistryKeyIterator::SubkeyCount() const {
-  base::ThreadRestrictions::AssertIOAllowed();
   DWORD count = 0;
   LONG result = ::RegQueryInfoKey(key_, NULL, 0, NULL, &count, NULL, NULL,
                                   NULL, NULL, NULL, NULL, NULL);
   if (result != ERROR_SUCCESS)
     return 0;
 
   return count;
 }
 
 bool RegistryKeyIterator::Valid() const {
   return key_ != NULL && index_ >= 0;
 }
 
 void RegistryKeyIterator::operator++() {
   --index_;
   Read();
 }
 
 bool RegistryKeyIterator::Read() {
-  base::ThreadRestrictions::AssertIOAllowed();
   if (Valid()) {
     DWORD ncount = arraysize(name_);
     FILETIME written;
     LONG r = ::RegEnumKeyEx(key_, index_, name_, &ncount, NULL, NULL,
                             NULL, &written);
     if (ERROR_SUCCESS == r)
       return true;
   }
 
   name_[0] = '\0';
   return false;
 }
 
 }  // namespace win
 }  // namespace base