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

components/policy/core/common/preg_parser_win.cc

 // Copyright (c) 2013 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 "components/policy/core/common/preg_parser_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
+#include <functional>
 #include <iterator>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"
 #include "base/values.h"
 #include "components/policy/core/common/policy_load_status.h"
 #include "components/policy/core/common/registry_dict_win.h"
 
 namespace policy {
@@ skipping 70 matching lines @@
 
   return current == L'\0';
 }
 
 std::string DecodePRegStringValue(const std::vector<uint8>& data) {
   size_t len = data.size() / sizeof(base::char16);
   if (len <= 0)
     return std::string();
 
   const base::char16* chars =
-      reinterpret_cast<const base::char16*>(vector_as_array(&data));
+      reinterpret_cast<const base::char16*>(data.data());
   base::string16 result;
   std::transform(chars, chars + len - 1, std::back_inserter(result),
                  std::ptr_fun(base::ByteSwapToLE16));
   return base::UTF16ToUTF8(result);
 }
 
 // Decodes a value from a PReg file given as a uint8 vector.
 bool DecodePRegValue(uint32 type,
                      const std::vector<uint8>& data,
                      scoped_ptr<base::Value>* value) {
   switch (type) {
     case REG_SZ:
     case REG_EXPAND_SZ:
       value->reset(new base::StringValue(DecodePRegStringValue(data)));
       return true;
     case REG_DWORD_LITTLE_ENDIAN:
     case REG_DWORD_BIG_ENDIAN:
       if (data.size() == sizeof(uint32)) {
-        uint32 val = *reinterpret_cast<const uint32*>(vector_as_array(&data));
+        uint32 val = *reinterpret_cast<const uint32*>(data.data());
         if (type == REG_DWORD_BIG_ENDIAN)
           val = base::NetToHost32(val);
         else
           val = base::ByteSwapToLE32(val);
         value->reset(new base::FundamentalValue(static_cast<int>(val)));
         return true;
       } else {
         LOG(ERROR) << "Bad data size " << data.size();
       }
       break;
@@ skipping 144 matching lines @@
     if (current == kDelimSemicolon) {
       if (!ReadField32(&cursor, end, &size))
         break;
       current = NextChar(&cursor, end);
     }
 
     if (current == kDelimSemicolon) {
       if (size > kMaxPRegFileSize)
         break;
       data.resize(size);
-      if (!ReadFieldBinary(&cursor, end, size, vector_as_array(&data)))
+      if (!ReadFieldBinary(&cursor, end, size, data.data()))
         break;
       current = NextChar(&cursor, end);
     }
 
     if (current != kDelimBracketClose)
       break;
 
     // Process the record if it is within the |root| subtree.
     if (base::StartsWith(base::i18n::ToLower(key_name),
                          base::i18n::ToLower(root),
                          base::CompareCase::SENSITIVE))
       HandleRecord(key_name.substr(root.size()), value, type, data, dict);
   }
 
   LOG(ERROR) << "Error parsing " << file_path.value() << " at offset "
              << reinterpret_cast<const uint8*>(cursor - 1) - mapped_file.data();
   status->Add(POLICY_LOAD_STATUS_PARSE_ERROR);
   return false;
 }
 
 }  // namespace preg_parser
 }  // namespace policy