diff options
| author | davidben <davidben@chromium.org> | 2016-01-20 17:40:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-21 01:41:32 +0000 |
| commit | 021a2b496a7eb7222c0c7f4d8cd01d697c3f2dda (patch) | |
| tree | d1af96a93a7e2f4defa4c680bc50a3170f06561a /net | |
| parent | 38b5efd43f39caec997e343801e3ae712d4c67ad (diff) | |
| download | chromium_src-021a2b496a7eb7222c0c7f4d8cd01d697c3f2dda.zip chromium_src-021a2b496a7eb7222c0c7f4d8cd01d697c3f2dda.tar.gz chromium_src-021a2b496a7eb7222c0c7f4d8cd01d697c3f2dda.tar.bz2 | |
Revert of Allow std::unordered_*. (patchset #15 id:280001 of https://codereview.chromium.org/1502373009/ )
Reason for revert:
MSan build failure.
https://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20Linux%20ChromeOS%20MSan%20Builder/builds/12498
Original issue's description:
> Allow std::unordered_*.
>
> base::hash_* is, as a transition step, implemented in terms of
> std::unordered_*. Later commits will convert existing uses.
>
> Also fix a host of IWYU problems that arose from this CL.
>
> (NOPRESUBMIT because the wstring presubmit check is overzealous
> and complains about the reference to wstring in the comment.)
>
> NOPRESUBMIT=true
> BUG=576864
> TBR=derat@chromium.org,blundell@chromium.org,jbauman@chromium.org,dalecurtis@chromium.org
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/3f37f7f1459e7b5a452c0e433493e0a6e9649ca7
> Cr-Commit-Position: refs/heads/master@{#370553}
TBR=danakj@chromium.org,thakis@chromium.org,derat@chromium.org,blundell@chromium.org,dalecurtis@chromium.org,jbauman@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=576864
Review URL: https://codereview.chromium.org/1610023003
Cr-Commit-Position: refs/heads/master@{#370559}
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/network_change_notifier_linux.h | 1 | ||||
| -rw-r--r-- | net/base/port_util.cc | 1 | ||||
| -rw-r--r-- | net/disk_cache/simple/simple_index_file.cc | 5 | ||||
| -rw-r--r-- | net/server/web_socket_encoder.cc | 1 | ||||
| -rw-r--r-- | net/spdy/spdy_alt_svc_wire_format.cc | 1 | ||||
| -rw-r--r-- | net/ssl/client_cert_store_nss.cc | 2 | ||||
| -rw-r--r-- | net/tools/quic/quic_server_session_base_test.cc | 1 | ||||
| -rw-r--r-- | net/tools/quic/quic_simple_server_session_test.cc | 1 |
8 files changed, 6 insertions, 7 deletions
diff --git a/net/base/network_change_notifier_linux.h b/net/base/network_change_notifier_linux.h index 48bda6b..85238cf9 100644 --- a/net/base/network_change_notifier_linux.h +++ b/net/base/network_change_notifier_linux.h @@ -6,7 +6,6 @@ #define NET_BASE_NETWORK_CHANGE_NOTIFIER_LINUX_H_ #include "base/compiler_specific.h" -#include "base/containers/hash_tables.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "net/base/net_export.h" diff --git a/net/base/port_util.cc b/net/base/port_util.cc index 7328b5e..1867dc3 100644 --- a/net/base/port_util.cc +++ b/net/base/port_util.cc @@ -4,7 +4,6 @@ #include "net/base/port_util.h" -#include <limits> #include <set> #include "base/lazy_instance.h" diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc index 025ffe9..7e80c02 100644 --- a/net/disk_cache/simple/simple_index_file.cc +++ b/net/disk_cache/simple/simple_index_file.cc @@ -423,7 +423,10 @@ void SimpleIndexFile::Deserialize(const char* data, int data_len, return; } - entries->reserve(index_metadata.GetNumberOfEntries() + kExtraSizeForMerge); +#if !defined(OS_WIN) + // TODO(gavinp): Consider using std::unordered_map. + entries->resize(index_metadata.GetNumberOfEntries() + kExtraSizeForMerge); +#endif while (entries->size() < index_metadata.GetNumberOfEntries()) { uint64_t hash_key; EntryMetadata entry_metadata; diff --git a/net/server/web_socket_encoder.cc b/net/server/web_socket_encoder.cc index d90a156..6d59713 100644 --- a/net/server/web_socket_encoder.cc +++ b/net/server/web_socket_encoder.cc @@ -4,7 +4,6 @@ #include "net/server/web_socket_encoder.h" -#include <limits> #include <utility> #include <vector> diff --git a/net/spdy/spdy_alt_svc_wire_format.cc b/net/spdy/spdy_alt_svc_wire_format.cc index a50590e..ba32160 100644 --- a/net/spdy/spdy_alt_svc_wire_format.cc +++ b/net/spdy/spdy_alt_svc_wire_format.cc @@ -4,7 +4,6 @@ #include "net/spdy/spdy_alt_svc_wire_format.h" -#include <algorithm> #include <limits> #include <string> diff --git a/net/ssl/client_cert_store_nss.cc b/net/ssl/client_cert_store_nss.cc index ef29b55..8a6c329 100644 --- a/net/ssl/client_cert_store_nss.cc +++ b/net/ssl/client_cert_store_nss.cc @@ -6,8 +6,6 @@ #include <nss.h> #include <ssl.h> - -#include <algorithm> #include <utility> #include "base/bind.h" diff --git a/net/tools/quic/quic_server_session_base_test.cc b/net/tools/quic/quic_server_session_base_test.cc index efe96ec..36432aa 100644 --- a/net/tools/quic/quic_server_session_base_test.cc +++ b/net/tools/quic/quic_server_session_base_test.cc @@ -26,6 +26,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +using __gnu_cxx::vector; using net::test::CryptoTestUtils; using net::test::MockConnection; using net::test::MockConnectionHelper; diff --git a/net/tools/quic/quic_simple_server_session_test.cc b/net/tools/quic/quic_simple_server_session_test.cc index fe9482f..e3ed3c9 100644 --- a/net/tools/quic/quic_simple_server_session_test.cc +++ b/net/tools/quic/quic_simple_server_session_test.cc @@ -30,6 +30,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +using __gnu_cxx::vector; using net::test::CryptoTestUtils; using net::test::MockConnection; using net::test::MockConnectionHelper; |
