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

base/win/registry.h

Index: base/win/registry.h
diff --git a/base/win/registry.h b/base/win/registry.h
index c3e015b3bf0e59636e26b9a5a58b4b147df729b1..af52b7158c9150075f6722e88f8c742b18fb250a 100644
--- a/base/win/registry.h
+++ b/base/win/registry.h
@@ -11,7 +11,6 @@
 
 #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"
 
@@ -180,7 +179,11 @@ class BASE_EXPORT RegistryValueIterator {
   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 {
+    // TODO(davidben): Switch this to value_.data() when
+    // https://crbug.com/555825 is resolved.
+    return value_.empty() ? nullptr : &*value_.begin();
+  }
   // ValueSize() is in bytes.
   DWORD ValueSize() const { return value_size_; }
   DWORD Type() const { return type_; }