1 files changed, 9 insertions, 19 deletions
diff --git a/absl/strings/cord.h b/absl/strings/cord.h
index 1e6a73a5..bca20981 100644
--- a/absl/strings/cord.h
+++ b/absl/strings/cord.h
@@ -84,6 +84,7 @@
 #include "absl/strings/internal/cordz_functions.h"
 #include "absl/strings/internal/cordz_info.h"
 #include "absl/strings/internal/cordz_statistics.h"
+#include "absl/strings/internal/cordz_update_scope.h"
 #include "absl/strings/internal/cordz_update_tracker.h"
 #include "absl/strings/internal/resize_uninitialized.h"
 #include "absl/strings/internal/string_constant.h"
@@ -669,7 +670,11 @@ class Cord {
   explicit constexpr Cord(strings_internal::StringConstant<T>);
 
  private:
+  using CordzInfo = cord_internal::CordzInfo;
+  using CordzUpdateScope = cord_internal::CordzUpdateScope;
   using CordzUpdateTracker = cord_internal::CordzUpdateTracker;
+  using InlineData = cord_internal::InlineData;
+  using MethodIdentifier = CordzUpdateTracker::MethodIdentifier;
 
   friend class CordTestPeer;
   friend bool operator==(const Cord& lhs, const Cord& rhs);
@@ -694,6 +699,7 @@ class Cord {
     static_assert(kMaxInline >= sizeof(absl::cord_internal::CordRep*), "");
 
     constexpr InlineRep() : data_() {}
+    explicit InlineRep(InlineData::DefaultInitType init) : data_(init) {}
     InlineRep(const InlineRep& src);
     InlineRep(InlineRep&& src);
     InlineRep& operator=(const InlineRep& src);
@@ -779,15 +785,6 @@ class Cord {
     // Resets the current cordz_info to null / empty.
     void clear_cordz_info() { data_.clear_cordz_info(); }
 
-    // Starts profiling this cord.
-    void StartProfiling();
-
-    // Starts profiling this cord which has been copied from `src`.
-    void StartProfiling(const Cord::InlineRep& src);
-
-    // Returns true if a Cord should be profiled and false otherwise.
-    static bool should_profile();
-
     // Updates the cordz statistics. info may be nullptr if the CordzInfo object
     // is unknown.
     void UpdateCordzStatistics();
@@ -964,9 +961,8 @@ inline Cord::InlineRep::InlineRep(const Cord::InlineRep& src)
   if (is_tree()) {
     data_.clear_cordz_info();
     absl::cord_internal::CordRep::Ref(as_tree());
-    if (ABSL_PREDICT_FALSE(should_profile())) {
-      StartProfiling(src);
-    }
+    CordzInfo::MaybeTrackCord(data_, src.data_,
+                              CordzUpdateTracker::kConstructorCord);
   }
 }
 
@@ -1040,9 +1036,7 @@ inline void Cord::InlineRep::set_tree(absl::cord_internal::CordRep* rep) {
     } else {
       // `data_` contains inlined data: initialize data_ to tree value `rep`.
       data_.make_tree(rep);
-      if (ABSL_PREDICT_FALSE(should_profile())) {
-        StartProfiling();
-      }
+      CordzInfo::MaybeTrackCord(data_, CordzUpdateTracker::kUnknown);
     }
     UpdateCordzStatistics();
   }
@@ -1074,10 +1068,6 @@ inline void Cord::InlineRep::CopyToArray(char* dst) const {
   cord_internal::SmallMemmove(dst, data_.as_chars(), n);
 }
 
-inline ABSL_ATTRIBUTE_ALWAYS_INLINE bool Cord::InlineRep::should_profile() {
-  return absl::cord_internal::cordz_should_profile();
-}
-
 inline void Cord::InlineRep::UpdateCordzStatistics() {
   if (ABSL_PREDICT_TRUE(!is_profiled())) return;
   UpdateCordzStatisticsSlow();