| commit | ef4e919472b5d3392ee0a203eb127cbbdfca18d2 | [log] [tgz] |
|---|---|---|
| author | Guido Urdaneta <[email protected]> | Mon Nov 09 15:06:24 2020 |
| committer | Guido Urdaneta <[email protected]> | Mon Nov 09 15:06:24 2020 |
| tree | 45175403bc09ae40ef30f904a583f8cedf36e53c | |
| parent | 8bd07a6cf9f06aabfa2af81c6e3679c0d51dad73 [diff] |
Reland "Move base/test/bind_test_util.h to base/test/bind.h" This reverts commit 8bd07a6cf9f06aabfa2af81c6e3679c0d51dad73. Reason for revert: This revert was incorrect and breaks the build. Original change's description: > Revert "Move base/test/bind_test_util.h to base/test/bind.h" > > This reverts commit a4493a6f807921ee85f7783e671c1d7d488c5bff. > > Reason for revert: This CL breaks internal builds (e.g. /chrome/browser/media/kaleidoscope/internal/kaleidoscope_browsertest.cc). > > Original change's description: > > Move base/test/bind_test_util.h to base/test/bind.h > > > > Stop relying on us to remember arcane file names when writing tests, > > and repeating the directory hierarchy into the file name. > > > > R=[email protected] > > TBR= > > NOPRESUBMIT=true > > > > Change-Id: I49c951162939c7dcef44883bee740f94b2f49e09 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523099 > > Commit-Queue: danakj <[email protected]> > > Reviewed-by: Daniel Cheng <[email protected]> > > Cr-Commit-Position: refs/heads/master@{#825145} > > [email protected],[email protected] > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Change-Id: If165b8443662baa564895e994ea0d772348e6da6 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526102 > Reviewed-by: Denis Kuznetsov [CET] <[email protected]> > Commit-Queue: Denis Kuznetsov [CET] <[email protected]> > Cr-Commit-Position: refs/heads/master@{#825328} [email protected],[email protected],[email protected] # Not skipping CQ checks because this is a reland. NOPRESUBMIT=true NOTREECHECK=true No-Try: True Change-Id: I6a8c0c8bbb1c8f87cc7f2df7a8b3388971292975 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526683 Commit-Queue: Guido Urdaneta <[email protected]> Reviewed-by: Guido Urdaneta <[email protected]> Cr-Commit-Position: refs/heads/master@{#825329}
diff --git a/ui/base/pointer/touch_ui_controller_unittest.cc b/ui/base/pointer/touch_ui_controller_unittest.cc index 1cfa4b8..98d7baa 100644 --- a/ui/base/pointer/touch_ui_controller_unittest.cc +++ b/ui/base/pointer/touch_ui_controller_unittest.cc
@@ -6,7 +6,7 @@ #include "base/macros.h" #include "base/scoped_observer.h" -#include "base/test/bind_test_util.h" +#include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/pointer/touch_ui_controller.h"