Add more NearbyConnections dependencies to the absl component

- container:btree, functional:bind_front and strings:str_format are
  added, none of them requires .def update
- container:btree does not build due to extra colon when
  __cpp_inline_variables is undefined, added a patch to only include
  colon when the macro is defined

Bug: 1046390
Change-Id: Id0f48966b185e582dbbce39de6f957ba6a534b8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2379833Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Alex Chau <alexchau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802285}

third_party/abseil-cpp/BUILD.gn

@@ -61,6 +61,7 @@ group("absl_component_deps") {
     "//third_party/abseil-cpp/absl/base",
     "//third_party/abseil-cpp/absl/base:config",
     "//third_party/abseil-cpp/absl/base:core_headers",
+    "//third_party/abseil-cpp/absl/container:btree",
     "//third_party/abseil-cpp/absl/container:fixed_array",
     "//third_party/abseil-cpp/absl/container:flat_hash_map",
     "//third_party/abseil-cpp/absl/container:flat_hash_set",
@@ -68,12 +69,14 @@ group("absl_component_deps") {
     "//third_party/abseil-cpp/absl/debugging:failure_signal_handler",
     "//third_party/abseil-cpp/absl/debugging:stacktrace",
     "//third_party/abseil-cpp/absl/debugging:symbolize",
+    "//third_party/abseil-cpp/absl/functional:bind_front",
     "//third_party/abseil-cpp/absl/hash",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/meta:type_traits",
     "//third_party/abseil-cpp/absl/numeric:int128",
     "//third_party/abseil-cpp/absl/status:status",
     "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/strings:str_format",
     "//third_party/abseil-cpp/absl/synchronization",
     "//third_party/abseil-cpp/absl/time",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -208,4 +211,3 @@ if (build_with_chromium) {
     ]
   }
 }
-

third_party/abseil-cpp/absl/types/compare.h

@@ -88,8 +88,7 @@ enum class ncmp : value_type { unordered = -127 };
 
 #define ABSL_COMPARE_INLINE_BASECLASS_DECL(name)
 
-#define ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) \
-  static const type name
+#define ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) static const type name;
 
 #define ABSL_COMPARE_INLINE_INIT(type, name, init) \
   inline constexpr type type::name(init)
@@ -156,8 +155,8 @@ class weak_equality
   friend struct compare_internal::weak_equality_base<weak_equality>;
 
  public:
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, equivalent);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, nonequivalent);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, equivalent)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, nonequivalent)
 
   // Comparisons
   friend constexpr bool operator==(
@@ -200,10 +199,10 @@ class strong_equality
   friend struct compare_internal::strong_equality_base<strong_equality>;
 
  public:
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equal);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequal);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equivalent);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequivalent);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equal)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequal)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equivalent)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequivalent)
 
   // Conversion
   constexpr operator weak_equality() const noexcept {  // NOLINT
@@ -263,10 +262,10 @@ class partial_ordering
   }
 
  public:
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, less);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, equivalent);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, greater);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, unordered);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, less)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, equivalent)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, greater)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, unordered)
 
   // Conversion
   constexpr operator weak_equality() const noexcept {  // NOLINT
@@ -351,9 +350,9 @@ class weak_ordering
   friend struct compare_internal::weak_ordering_base<weak_ordering>;
 
  public:
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, less);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, equivalent);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, greater);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, less)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, equivalent)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, greater)
 
   // Conversions
   constexpr operator weak_equality() const noexcept {  // NOLINT
@@ -441,10 +440,10 @@ class strong_ordering
   friend struct compare_internal::strong_ordering_base<strong_ordering>;
 
  public:
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, less);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equal);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equivalent);
-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, greater);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, less)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equal)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equivalent)
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, greater)
 
   // Conversions
   constexpr operator weak_equality() const noexcept {  // NOLINT

third_party/abseil-cpp/patches/0003-Remove-extra-for-ABSL_COMPARE_INLINE_SUBCLASS_.patch

+From 8ab834b3924f8b1c295847542c1180ec536165b6 Mon Sep 17 00:00:00 2001
+From: Alex Chau <alexchau@chromium.org>
+Date: Thu, 27 Aug 2020 16:21:27 +0100
+Subject: [PATCH] Remove extra ; for ABSL_COMPARE_INLINE_SUBCLASS_DECL
+
+---
+ third_party/abseil-cpp/absl/types/compare.h | 37 ++++++++++-----------
+ 1 file changed, 18 insertions(+), 19 deletions(-)
+
+diff --git a/third_party/abseil-cpp/absl/types/compare.h b/third_party/abseil-cpp/absl/types/compare.h
+index 62ca70f9a704..afe5a7c1d2c6 100644
+--- a/third_party/abseil-cpp/absl/types/compare.h
++++ b/third_party/abseil-cpp/absl/types/compare.h
+@@ -88,8 +88,7 @@ enum class ncmp : value_type { unordered = -127 };
+
+ #define ABSL_COMPARE_INLINE_BASECLASS_DECL(name)
+
+-#define ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) \
+-  static const type name
++#define ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) static const type name;
+
+ #define ABSL_COMPARE_INLINE_INIT(type, name, init) \
+   inline constexpr type type::name(init)
+@@ -156,8 +155,8 @@ class weak_equality
+   friend struct compare_internal::weak_equality_base<weak_equality>;
+
+  public:
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, equivalent);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, nonequivalent);
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, equivalent)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_equality, nonequivalent)
+
+   // Comparisons
+   friend constexpr bool operator==(
+@@ -200,10 +199,10 @@ class strong_equality
+   friend struct compare_internal::strong_equality_base<strong_equality>;
+
+  public:
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equal);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequal);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equivalent);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequivalent);
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equal)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequal)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, equivalent)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_equality, nonequivalent)
+
+   // Conversion
+   constexpr operator weak_equality() const noexcept {  // NOLINT
+@@ -263,10 +262,10 @@ class partial_ordering
+   }
+
+  public:
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, less);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, equivalent);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, greater);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, unordered);
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, less)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, equivalent)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, greater)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, unordered)
+
+   // Conversion
+   constexpr operator weak_equality() const noexcept {  // NOLINT
+@@ -351,9 +350,9 @@ class weak_ordering
+   friend struct compare_internal::weak_ordering_base<weak_ordering>;
+
+  public:
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, less);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, equivalent);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, greater);
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, less)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, equivalent)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, greater)
+
+   // Conversions
+   constexpr operator weak_equality() const noexcept {  // NOLINT
+@@ -441,10 +440,10 @@ class strong_ordering
+   friend struct compare_internal::strong_ordering_base<strong_ordering>;
+
+  public:
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, less);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equal);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equivalent);
+-  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, greater);
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, less)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equal)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equivalent)
++  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, greater)
+
+   // Conversions
+   constexpr operator weak_equality() const noexcept {  // NOLINT
+--
+2.28.0.297.g1956fa8f8d-goog