Add TraceEvent.scoped to serialization in CriticalPersistedTabData

Bug: 1119856
Change-Id: Id9f07fb02232d8a6ed7cfedf2c144e6e3c3a82c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2372923Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Commit-Queue: David Maunder <davidjm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802066}

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java

@@ -15,6 +15,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
 import org.chromium.base.ObserverList;
+import org.chromium.base.TraceEvent;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabLaunchType;
 import org.chromium.chrome.browser.tab.WebContentsState;
@@ -207,7 +208,7 @@ public class CriticalPersistedTabData extends PersistedTabData {
 
     @Override
     boolean deserialize(@Nullable byte[] bytes) {
-        try {
+        try (TraceEvent e = TraceEvent.scoped("CriticalPersistedTabData.Deserialize")) {
             CriticalPersistedTabDataProto criticalPersistedTabDataProto =
                     CriticalPersistedTabDataProto.parseFrom(bytes);
             mParentId = criticalPersistedTabDataProto.getParentId();
@@ -354,6 +355,7 @@ public class CriticalPersistedTabData extends PersistedTabData {
     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     @Override
     public byte[] serialize() {
+        try (TraceEvent e = TraceEvent.scoped("CriticalPersistedTabData.Serialize")) {
             WebContentsState webContentsState = mWebContentsState;
             if (webContentsState == null) {
                 webContentsState = getWebContentsStateFromTab(mTab);
@@ -373,6 +375,7 @@ public class CriticalPersistedTabData extends PersistedTabData {
                     .build()
                     .toByteArray();
         }
+    }
 
     protected static byte[] getContentStateByteArray(ByteBuffer buffer) {
         byte[] contentsStateBytes = new byte[buffer.limit()];

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/PersistedTabData.java

@@ -188,7 +188,6 @@ public abstract class PersistedTabData implements UserData {
     abstract byte[] serialize();
 
     private byte[] serializeAndLog() {
-        // TODO(crbug.com/1119856) Add trace events
         byte[] res = serialize();
         RecordHistogram.recordBooleanHistogram(
                 "Tabs.PersistedTabData.Serialize." + getUmaTag(), res != null);