Skip to content

Commit

Permalink
Swap from base/stl_util.h to cxx17_backports.h in rlz/ .cc files.
Browse files Browse the repository at this point in the history
base::size() has been moved to base/cxx17_backports.h, so .cc files that
use base::size(), but no other function from base/stl_util.h, can
directly include base/cxx17_backports.h and not base/stl_util.h.

Bug: 1210983
Change-Id: I1585d943947e9cb03da0864e21092833391b6183
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2967349
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#893434}
  • Loading branch information
leizleiz authored and Chromium LUCI CQ committed Jun 17, 2021
1 parent 8e06f41 commit 6731562
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion rlz/chromeos/lib/rlz_value_store_chromeos.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "base/base_paths.h"
#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/cxx17_backports.h"
#include "base/files/file_util.h"
#include "base/files/important_file_writer.h"
#include "base/json/json_file_value_serializer.h"
Expand All @@ -17,7 +18,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/path_service.h"
#include "base/sequenced_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/values.h"
Expand Down
2 changes: 1 addition & 1 deletion rlz/lib/financial_ping.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
#include <memory>

#include "base/atomicops.h"
#include "base/cxx17_backports.h"
#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/no_destructor.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion rlz/lib/financial_ping_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <stdint.h>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion rlz/lib/rlz_lib.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <algorithm>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/syslog_logging.h"
Expand Down
2 changes: 1 addition & 1 deletion rlz/lib/rlz_lib_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
#endif

#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "base/cxx17_backports.h"
#include "base/files/important_file_writer.h"
#include "base/stl_util.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
#include "rlz/chromeos/lib/rlz_value_store_chromeos.h"
Expand Down
2 changes: 1 addition & 1 deletion rlz/lib/string_utils_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <stddef.h>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/utf_string_conversions.h"
#include "rlz/lib/assert.h"
#include "testing/gmock/include/gmock/gmock.h"
Expand Down
2 changes: 1 addition & 1 deletion rlz/win/lib/machine_deal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <stddef.h>
#include <vector>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
Expand Down
2 changes: 1 addition & 1 deletion rlz/win/lib/machine_id_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <memory>
#include <string>

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/utf_string_conversions.h"
#include "rlz/lib/assert.h"

Expand Down
2 changes: 1 addition & 1 deletion rlz/win/lib/rlz_value_store_registry.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "rlz/win/lib/rlz_value_store_registry.h"

#include "base/stl_util.h"
#include "base/cxx17_backports.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
Expand Down

0 comments on commit 6731562

Please sign in to comment.