summaryrefslogtreecommitdiffstats
path: root/chrome/browser/google/google_brand.cc
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2016-01-20 17:40:42 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-21 01:41:32 +0000
commit021a2b496a7eb7222c0c7f4d8cd01d697c3f2dda (patch)
treed1af96a93a7e2f4defa4c680bc50a3170f06561a /chrome/browser/google/google_brand.cc
parent38b5efd43f39caec997e343801e3ae712d4c67ad (diff)
downloadchromium_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 'chrome/browser/google/google_brand.cc')
-rw-r--r--chrome/browser/google/google_brand.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/google/google_brand.cc b/chrome/browser/google/google_brand.cc
index 7e07284e..5360948 100644
--- a/chrome/browser/google/google_brand.cc
+++ b/chrome/browser/google/google_brand.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/google/google_brand.h"
-#include <algorithm>
#include <string>
#include "base/macros.h"