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

base/win/registry.h

 // 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.
 
 #ifndef BASE_WIN_REGISTRY_H_
 #define BASE_WIN_REGISTRY_H_
 
 #include <windows.h>
 #include <string>
 #include <vector>
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/stl_util.h"
 #include "base/win/object_watcher.h"
 #include "base/win/scoped_handle.h"
 
 namespace base {
 namespace win {
 
 // Utility class to read, write and manipulate the Windows Registry.
 // Registry vocabulary primer: a "key" is like a folder, in which there
 // are "values", which are <name, data> pairs, with an associated data type.
 //
@@ skipping 148 matching lines @@
 
   DWORD ValueCount() const;
 
   // True while the iterator is valid.
   bool Valid() const;
 
   // Advances to the next registry entry.
   void operator++();
 
   const wchar_t* Name() const { return name_.c_str(); }
-  const wchar_t* Value() const { return vector_as_array(&value_); }
+  const wchar_t* Value() const { return value_.data(); }
   // ValueSize() is in bytes.
   DWORD ValueSize() const { return value_size_; }
   DWORD Type() const { return type_; }
 
   int Index() const { return index_; }
 
  private:
   // Read in the current values.
   bool Read();
 
@@ skipping 56 matching lines @@
 
   wchar_t name_[MAX_PATH];
 
   DISALLOW_COPY_AND_ASSIGN(RegistryKeyIterator);
 };
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_WIN_REGISTRY_H_