commit 34357f0206ac028808fc0d8c63ac43011b27b7cd
author Alex Vakulenko <avakulenko@chromium.org> Wed Aug 20 16:39:18 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Aug 22 00:43:07 2014 +0000
tree 49a7637d63bc31a4c79bb73c652730396f85cde4
parent 3aeea1c2624d3213e482c3dd3a1645e88432eca4

libchromeos: Move map_utils from Buffet to libchromeos

BUG=chromium:405714
TEST=USE=buffet ./build_packages

Change-Id: Ic7b1762bdea4c126c6442bf013d7bbc84514c7ec
Reviewed-on: https://chromium-review.googlesource.com/213365
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

buffet/http_request.cc

diff --git a/buffet/http_request.cc b/buffet/http_request.cc
index d818b07..dfeac7f 100644
--- a/buffet/http_request.cc
+++ b/buffet/http_request.cc
@@ -5,12 +5,12 @@
 #include "buffet/http_request.h"
 
 #include <base/logging.h>
+#include <chromeos/map_utils.h>
 #include <chromeos/mime_utils.h>
 #include <chromeos/string_utils.h>
 
 #include "buffet/http_connection_curl.h"
 #include "buffet/http_transport_curl.h"
-#include "buffet/map_utils.h"
 
 namespace buffet {
 namespace http {
@@ -186,7 +186,7 @@
 bool Request::SendRequestIfNeeded(chromeos::ErrorPtr* error) {
   if (transport_) {
     if (!connection_) {
-      http::HeaderList headers = MapToVector(headers_);
+      http::HeaderList headers = chromeos::MapToVector(headers_);
       std::vector<std::string> ranges;
       if (method_ != request_type::kHead) {
         ranges.reserve(ranges_.size());

buffet/map_utils.h

diff --git a/buffet/map_utils.h b/buffet/map_utils.h
deleted file mode 100644
index f5e3f30..0000000
--- a/buffet/map_utils.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2014 The Chromium OS 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 BUFFET_MAP_UTILS_H_
-#define BUFFET_MAP_UTILS_H_
-
-#include <map>
-#include <utility>
-#include <vector>
-
-namespace buffet {
-
-// Given an STL map returns a vector containing all keys from the map
-template<typename T>
-std::vector<typename T::key_type> GetMapKeys(const T& map) {
-  std::vector<typename T::key_type> keys;
-  keys.reserve(map.size());
-  for (const auto& pair : map)
-    keys.push_back(pair.first);
-  return keys;
-}
-
-// Given an STL map returns a vector containing all values from the map
-template<typename T>
-std::vector<typename T::mapped_type> GetMapValues(const T& map) {
-  std::vector<typename T::mapped_type> values;
-  values.reserve(map.size());
-  for (const auto& pair : map)
-    values.push_back(pair.second);
-  return values;
-}
-
-// Given an STL map returns a vector of key-value pairs from the map
-template<typename T>
-std::vector<std::pair<typename T::key_type,
-                      typename T::mapped_type>> MapToVector(const T& map) {
-  std::vector<std::pair<typename T::key_type, typename T::mapped_type>> vector;
-  vector.reserve(map.size());
-  for (const auto& pair : map)
-    vector.push_back(pair);
-  return vector;
-}
-
-}  // namespace buffet
-
-#endif  // BUFFET_MAP_UTILS_H_