Make vector_as_array use std::vector::data and switch a few directories.

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"
@@ skipping 551 matching lines @@
 }
 
 bool RegistryValueIterator::Read() {
   if (Valid()) {
     DWORD capacity = static_cast<DWORD>(name_.capacity());
     DWORD name_size = capacity;
     // |value_size_| is in bytes. Reserve the last character for a NUL.
     value_size_ = static_cast<DWORD>((value_.size() - 1) * sizeof(wchar_t));
     LONG result = ::RegEnumValue(
         key_, index_, WriteInto(&name_, name_size), &name_size, NULL, &type_,
-        reinterpret_cast<BYTE*>(vector_as_array(&value_)), &value_size_);
+        reinterpret_cast<BYTE*>(value_.data()), &value_size_);
 
     if (result == ERROR_MORE_DATA) {
       // Registry key names are limited to 255 characters and fit within
       // MAX_PATH (which is 260) but registry value names can use up to 16,383
       // characters and the value itself is not limited
       // (from http://msdn.microsoft.com/en-us/library/windows/desktop/
       // ms724872(v=vs.85).aspx).
       // Resize the buffers and retry if their size caused the failure.
       DWORD value_size_in_wchars = to_wchar_size(value_size_);
       if (value_size_in_wchars + 1 > value_.size())
         value_.resize(value_size_in_wchars + 1, L'\0');
       value_size_ = static_cast<DWORD>((value_.size() - 1) * sizeof(wchar_t));
       name_size = name_size == capacity ? MAX_REGISTRY_NAME_SIZE : capacity;
       result = ::RegEnumValue(
           key_, index_, WriteInto(&name_, name_size), &name_size, NULL, &type_,
-          reinterpret_cast<BYTE*>(vector_as_array(&value_)), &value_size_);
+          reinterpret_cast<BYTE*>(value_.data()), &value_size_);
     }
 
     if (result == ERROR_SUCCESS) {
       DCHECK_LT(to_wchar_size(value_size_), value_.size());
       value_[to_wchar_size(value_size_)] = L'\0';
       return true;
     }
   }
 
   name_[0] = L'\0';
@@ skipping 72 matching lines @@
     } else {
       index_ = count - 1;
     }
   }
 
   Read();
 }
 
 }  // namespace win
 }  // namespace base