summaryrefslogtreecommitdiff
path: root/google
diff options
context:
space:
mode:
authorGabriel Charette <gab@chromium.org>2019-08-23 03:31:40 +0000
committerGabriel Charette <gab@chromium.org>2019-08-23 03:31:40 +0000
commit4b23ce8b1464ed4c87457682a61cd1ed9bd4d9d3 (patch)
tree23a3e9bbc56a22fce9625053a877d7d5b007b722 /google
parent92f837f88a05c7dee4b03fb41fc20dad0eeae06e (diff)
downloadzlib-4b23ce8b1464ed4c87457682a61cd1ed9bd4d9d3.tar.gz
Reland "[TaskEnvironment] Complete migration with header rename"
This is a reland of 18947083c7e75ec6d5e8c3b729515d83bde41c59 The move_source_file.py script's formatting rules incorrectly formatted services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc after all. But we also can't rely 100% on git cl format (crbug.com/997063) so I ended up performing a git cl format && git add -up (+interactive addition of missing blank line after foo.h when included from top of foo.cc) Also added $ tools/git/move_source_file.py net/test/test_with_scoped_task_environment.h net/test/test_with_task_environment.h Original change's description: > [TaskEnvironment] Complete migration with header rename > > This is merely: > > $ tools/git/move_source_file.py base/test/scoped_task_environment.h base/test/task_environment.h > $ tools/git/move_source_file.py base/test/scoped_task_environment.cc base/test/task_environment.cc > $ tools/git/move_source_file.py base/test/scoped_task_environment_unittest.cc base/test/task_environment_unittest.cc > $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle.h content/public/test/browser_task_environment.h > $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle.cc content/public/test/browser_task_environment.cc > $ tools/git/move_source_file.py content/public/test/test_browser_thread_bundle_unittest.cc content/public/test/browser_task_environment_unittest.cc > $ tools/git/move_source_file.py ios/web/public/test/test_web_thread_bundle.h ios/web/public/test/web_task_environment.h > $ tools/git/move_source_file.py ios/web/test/test_web_thread_bundle.cc ios/web/test/web_task_environment.cc > > and a few manual renames in DEPS files missed by the script > > This CL uses --bypass-hooks to avoid having to git cl format because > many headers are being reordered by git cl format and it's too many to > figure out in a no-op CL which ones are okay with it. > windows.h for one should typically be first and another one of the > reorderings in PS3 even caused a compile failure: > https://chromium-review.googlesource.com/c/chromium/src/+/1764962/3/components/services/font/font_loader_unittest.cc > > TBR=dcheng@chromium.org > > Bug: 992483 > Change-Id: I32a4afd43ef779393c95d9873c157be2d3da1dd1 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764962 > Reviewed-by: Gabriel Charette <gab@chromium.org> > Reviewed-by: Daniel Cheng <dcheng@chromium.org> > Commit-Queue: Gabriel Charette <gab@chromium.org> > Cr-Commit-Position: refs/heads/master@{#689778} TBR=dcheng@chromium.org Bug: 992483 Change-Id: I6179dd1329a4d30bf5c65450ea893537f31e6f85 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1767658 Reviewed-by: Gabriel Charette <gab@chromium.org> Commit-Queue: Gabriel Charette <gab@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#689794} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: c7108748948a6ab308f323d6e72c59d29c7e240a
Diffstat (limited to 'google')
-rw-r--r--google/zip_reader_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/google/zip_reader_unittest.cc b/google/zip_reader_unittest.cc
index a8b1ef2..aa20185 100644
--- a/google/zip_reader_unittest.cc
+++ b/google/zip_reader_unittest.cc
@@ -22,7 +22,7 @@
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/test/scoped_task_environment.h"
+#include "base/test/task_environment.h"
#include "base/time/time.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"